diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-19 15:17:56 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-20 18:15:57 +0200 |
commit | c1c7c3cfa9d8c3e6f05095d0880a84a13a0d9e01 (patch) | |
tree | 1a77807a994125236fc6631e84cdad83d9e3897e /lib/browser_context_qt.h | |
parent | abd17e1583e8e13b1a46d599fb695c1189550226 (diff) |
Centralize type conversion functions.
This adds the common GURL->QUrl and string16->QString conversions
into a common header and use those functions throughout the code.
Move the qStringToStringType into the same header and rename it
to a name consistent with the others.
This also cleans up shared_globals.h by moving content:: forward
declarations in the cpp, where they are used.
Change-Id: I19527ea7de1f6047aae8b44c97eb4d7c3e5a0e54
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/browser_context_qt.h')
-rw-r--r-- | lib/browser_context_qt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/browser_context_qt.h b/lib/browser_context_qt.h index 8ba01779a..88bba1e9e 100644 --- a/lib/browser_context_qt.h +++ b/lib/browser_context_qt.h @@ -66,6 +66,7 @@ #include "download_manager_delegate_qt.h" #include "resource_context_qt.h" +#include "type_conversion.h" #include "url_request_context_getter_qt.h" class BrowserContextQt : public content::BrowserContext @@ -90,7 +91,7 @@ public: dataLocation = QDir::homePath() % QDir::separator() % QChar::fromLatin1('.') % QCoreApplication::applicationName(); dataLocation.append(QDir::separator() % QStringLiteral("QtWebEngine")); - return base::FilePath(qStringToStringType(dataLocation)); + return base::FilePath(toFilePathString(dataLocation)); } virtual bool IsOffTheRecord() const Q_DECL_OVERRIDE |