diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-02-05 16:11:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 15:18:57 +0100 |
| commit | 22d4f9340ca37d28d7ed463a3a5dc00a5182b311 (patch) | |
| tree | eaf2bcb0fe61366467ec683d9effbd2669761d5d /src/core/content_main_delegate_qt.cpp | |
| parent | 2f2735388fc48afa5bca0246efb8f50ae1fc4bd9 (diff) | |
Register a path provider for Qt instead of using PathService::Override
Change-Id: I465a5465ec4189b077a8c1cbab7485c628eca899
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/content_main_delegate_qt.cpp')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 20bedc039..43cca7ef9 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -63,9 +63,8 @@ static base::StringPiece PlatformResourceProvider(int key) { void ContentMainDelegateQt::PreSandboxStartup() { - PathService::Override(base::FILE_EXE, WebEngineLibraryInfo::subProcessPath()); - PathService::Override(content::DIR_MEDIA_LIBS, WebEngineLibraryInfo::pluginsPath()); - PathService::Override(ui::DIR_LOCALES, WebEngineLibraryInfo::localesPath()); + // Register the Qt path provider which handles necessary paths for base, ui and content. + PathService::RegisterProvider(WebEngineLibraryInfo::pathProviderQt, base::PATH_START, content::PATH_END); net::NetModule::SetResourceProvider(PlatformResourceProvider); ui::ResourceBundle::InitSharedInstanceWithLocale(l10n_util::GetApplicationLocale(std::string("en-US")), 0); |