diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2013-12-02 18:04:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 11:56:56 +0100 |
commit | 164f3839cc24d14590e11f898a39d4b05b90ce51 (patch) | |
tree | 1e3a72c9d7cff5629f533f2b408f488118709cef /src/core/content_main_delegate_qt.cpp | |
parent | 32fffe6b2f8a5e44b6f8d3056104c2010726037c (diff) |
Use ContentMainDelegateQt also for child processes
This will be necessary in order for the render process to load
localized strings among other things.
Change-Id: Ibb75e49f0bc583c158af61817e5b350f3534ec16
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/content_main_delegate_qt.cpp')
-rw-r--r-- | src/core/content_main_delegate_qt.cpp | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp new file mode 100644 index 000000000..9798d6f70 --- /dev/null +++ b/src/core/content_main_delegate_qt.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "content_main_delegate_qt.h" + +#include "base/path_service.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/ui_base_paths.h" +#include "ui/base/resource/resource_bundle.h" +#include <QByteArray> +#include <QLibraryInfo> +#include <QStringBuilder> + +#include "content_client_qt.h" +#include "type_conversion.h" + +static QByteArray subProcessPath() { + static bool initialized = false; +#ifdef QTWEBENGINEPROCESS_PATH + static QByteArray processPath(QTWEBENGINEPROCESS_PATH); +#else + static QByteArray processPath; +#endif + if (initialized) + return processPath; + // Allow overriding at runtime for the time being. + const QByteArray fromEnv = qgetenv("QTWEBENGINEPROCESS_PATH"); + if (!fromEnv.isEmpty()) + processPath = fromEnv; + if (processPath.isEmpty()) + qFatal("QTWEBENGINEPROCESS_PATH environment variable not set or empty."); + initialized = true; + return processPath; +} + +void ContentMainDelegateQt::PreSandboxStartup() +{ + PathService::Override(base::FILE_EXE, base::FilePath(toFilePathString(subProcessPath()))); + const QString localesPath(QLibraryInfo::location(QLibraryInfo::TranslationsPath) % QStringLiteral("/qtwebengine_locales")); + PathService::Override(ui::DIR_LOCALES, base::FilePath(toFilePathString(localesPath))); + + ui::ResourceBundle::InitSharedInstanceWithLocale(l10n_util::GetApplicationLocale(std::string("en-US")), 0); +} + +content::ContentBrowserClient *ContentMainDelegateQt::CreateContentBrowserClient() +{ + m_browserClient.reset(new ContentBrowserClientQt); + return m_browserClient.get(); +} + +bool ContentMainDelegateQt::BasicStartupComplete(int *exit_code) +{ + SetContentClient(new ContentClientQt); + return false; +} + |