From be439d60f262467d90ba4dd7649559e30252a2b1 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 4 Feb 2014 17:45:27 +0100 Subject: Move the implementation of BrowserContextQt to its own cpp file Change-Id: Ie44a8733e3f9123c3d086f8df9ddcf2833bd235b Reviewed-by: Jocelyn Turcotte --- src/core/browser_context_qt.cpp | 147 ++++++++++++++++++++++++++++++++++++++ src/core/browser_context_qt.h | 108 +++++----------------------- src/core/core_gyp_generator.pro | 3 +- src/core/web_contents_adapter.cpp | 1 + src/core/web_contents_view_qt.cpp | 1 + 5 files changed, 170 insertions(+), 90 deletions(-) create mode 100644 src/core/browser_context_qt.cpp (limited to 'src') diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp new file mode 100644 index 000000000..c2c17cd70 --- /dev/null +++ b/src/core/browser_context_qt.cpp @@ -0,0 +1,147 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 "browser_context_qt.h" + +#include "type_conversion.h" +#include "qtwebenginecoreglobal.h" +#include "resource_context_qt.h" +#include "url_request_context_getter_qt.h" + +#include "base/files/scoped_temp_dir.h" +#include "base/time/time.h" +#include "content/public/browser/browser_thread.h" +#include "content/public/browser/storage_partition.h" +#include "net/proxy/proxy_config_service.h" + +#include +#include +#include +#include +#include +#include + +BrowserContextQt::BrowserContextQt() +{ + resourceContext.reset(new ResourceContextQt(this)); + downloadManagerDelegate.reset(new DownloadManagerDelegateQt); +} + +BrowserContextQt::~BrowserContextQt() +{ + if (resourceContext) + content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, resourceContext.release()); +} + +base::FilePath BrowserContextQt::GetPath() const +{ + QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + if (dataLocation.isEmpty()) + dataLocation = QDir::homePath() % QDir::separator() % QChar::fromLatin1('.') % QCoreApplication::applicationName(); + + dataLocation.append(QDir::separator() % QStringLiteral("QtWebEngine")); + return base::FilePath(toFilePathString(dataLocation)); +} + +bool BrowserContextQt::IsOffTheRecord() const +{ + return false; +} + +net::URLRequestContextGetter *BrowserContextQt::GetRequestContext() +{ + return GetDefaultStoragePartition(this)->GetURLRequestContext(); +} + +net::URLRequestContextGetter *BrowserContextQt::GetRequestContextForRenderProcess(int) +{ + return GetRequestContext(); +} + +net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContext() +{ + return GetRequestContext(); +} + +net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContextForRenderProcess(int) +{ + return GetRequestContext(); +} + +net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContextForStoragePartition(const base::FilePath&, bool) +{ + return GetRequestContext(); +} + +void BrowserContextQt::RequestMIDISysExPermission(int render_process_id, int render_view_id, const GURL &requesting_frame, const MIDISysExPermissionCallback &callback) +{ + // Always reject requests for testing. + callback.Run(false); +} + +content::ResourceContext *BrowserContextQt::GetResourceContext() +{ + return resourceContext.get(); +} + +content::DownloadManagerDelegate *BrowserContextQt::GetDownloadManagerDelegate() +{ + return downloadManagerDelegate.get(); +} + +content::GeolocationPermissionContext *BrowserContextQt::GetGeolocationPermissionContext() +{ + QT_NOT_YET_IMPLEMENTED + return 0; +} + +quota::SpecialStoragePolicy *BrowserContextQt::GetSpecialStoragePolicy() +{ + QT_NOT_YET_IMPLEMENTED + return 0; +} + +net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers) +{ + url_request_getter_ = new URLRequestContextGetterQt(GetPath()); + static_cast(resourceContext.get())->set_url_request_context_getter(url_request_getter_.get()); + return url_request_getter_.get(); +} diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h index dcd494b18..c9b8df238 100644 --- a/src/core/browser_context_qt.h +++ b/src/core/browser_context_qt.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -43,102 +43,32 @@ #define BROWSER_CONTEXT_QT_H #include "content/public/browser/browser_context.h" - -#include "base/files/scoped_temp_dir.h" - -#include "base/time/time.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/resource_context.h" -#include "content/public/browser/storage_partition.h" #include "net/url_request/url_request_context.h" -#include "net/proxy/proxy_config_service.h" - -#include -#include -#include -#include -#include -#include -#include - #include "download_manager_delegate_qt.h" -#include "qtwebenginecoreglobal.h" -#include "resource_context_qt.h" -#include "type_conversion.h" -#include "url_request_context_getter_qt.h" class BrowserContextQt : public content::BrowserContext { public: - explicit BrowserContextQt() - { - resourceContext.reset(new ResourceContextQt(this)); - downloadManagerDelegate.reset(new DownloadManagerDelegateQt); - } - - virtual ~BrowserContextQt() - { - if (resourceContext) - content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, resourceContext.release()); - } - - virtual base::FilePath GetPath() const Q_DECL_OVERRIDE - { - QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation); - if (dataLocation.isEmpty()) - dataLocation = QDir::homePath() % QDir::separator() % QChar::fromLatin1('.') % QCoreApplication::applicationName(); - - dataLocation.append(QDir::separator() % QStringLiteral("QtWebEngine")); - return base::FilePath(toFilePathString(dataLocation)); - } - - virtual bool IsOffTheRecord() const Q_DECL_OVERRIDE - { - return false; - } - - virtual net::URLRequestContextGetter* GetRequestContext() Q_DECL_OVERRIDE - { - return GetDefaultStoragePartition(this)->GetURLRequestContext(); - } - virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(int) Q_DECL_OVERRIDE { return GetRequestContext(); } - virtual net::URLRequestContextGetter* GetMediaRequestContext() Q_DECL_OVERRIDE { return GetRequestContext(); } - virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(int) Q_DECL_OVERRIDE { return GetRequestContext(); } - virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(const base::FilePath&, bool) Q_DECL_OVERRIDE { return GetRequestContext(); } - - virtual void RequestMIDISysExPermission(int render_process_id, int render_view_id, const GURL& requesting_frame, const MIDISysExPermissionCallback& callback) Q_DECL_OVERRIDE - { - // Always reject requests for testing. - callback.Run(false); - } - - virtual content::ResourceContext* GetResourceContext() Q_DECL_OVERRIDE - { - return resourceContext.get(); - } - - virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() Q_DECL_OVERRIDE - { - return downloadManagerDelegate.get(); - } - virtual content::GeolocationPermissionContext* GetGeolocationPermissionContext() Q_DECL_OVERRIDE - { - QT_NOT_YET_IMPLEMENTED - return 0; - } - virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() Q_DECL_OVERRIDE - { - QT_NOT_YET_IMPLEMENTED - return 0; - } - - net::URLRequestContextGetter *CreateRequestContext(content::ProtocolHandlerMap* protocol_handlers) - { - url_request_getter_ = new URLRequestContextGetterQt(GetPath()); - static_cast(resourceContext.get())->set_url_request_context_getter(url_request_getter_.get()); - return url_request_getter_.get(); - } + explicit BrowserContextQt(); + + virtual ~BrowserContextQt(); + + virtual base::FilePath GetPath() const Q_DECL_OVERRIDE; + virtual bool IsOffTheRecord() const Q_DECL_OVERRIDE; + + virtual net::URLRequestContextGetter *GetRequestContext() Q_DECL_OVERRIDE; + virtual net::URLRequestContextGetter *GetRequestContextForRenderProcess(int) Q_DECL_OVERRIDE; + virtual net::URLRequestContextGetter *GetMediaRequestContext() Q_DECL_OVERRIDE; + virtual net::URLRequestContextGetter *GetMediaRequestContextForRenderProcess(int) Q_DECL_OVERRIDE; + virtual net::URLRequestContextGetter *GetMediaRequestContextForStoragePartition(const base::FilePath&, bool) Q_DECL_OVERRIDE; + virtual void RequestMIDISysExPermission(int render_process_id, int render_view_id, const GURL &requesting_frame, const MIDISysExPermissionCallback &callback) Q_DECL_OVERRIDE; + virtual content::ResourceContext *GetResourceContext() Q_DECL_OVERRIDE; + virtual content::DownloadManagerDelegate *GetDownloadManagerDelegate() Q_DECL_OVERRIDE; + virtual content::GeolocationPermissionContext *GetGeolocationPermissionContext() Q_DECL_OVERRIDE; + virtual quota::SpecialStoragePolicy *GetSpecialStoragePolicy() Q_DECL_OVERRIDE; + net::URLRequestContextGetter *CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers); private: scoped_ptr resourceContext; diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index b6fb85418..b31ffccde 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -33,6 +33,8 @@ INCLUDEPATH += $$[QT_INSTALL_HEADERS] $$PWD SOURCES = \ backing_store_qt.cpp \ + browser_context_qt.cpp \ + chromium_gpu_helper.cpp \ chromium_overrides.cpp \ common/qt_messages.cpp \ content_client_qt.cpp \ @@ -41,7 +43,6 @@ SOURCES = \ delegated_frame_node.cpp \ dev_tools_http_handler_delegate_qt.cpp \ download_manager_delegate_qt.cpp \ - chromium_gpu_helper.cpp \ javascript_dialog_controller.cpp \ javascript_dialog_manager_qt.cpp \ process_main.cpp \ diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index dfd924e66..9f4768e12 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -59,6 +59,7 @@ #include "content/public/common/renderer_preferences.h" #include "ui/shell_dialogs/selected_file_info.h" +#include #include #include #include diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp index e89bac7a2..65b8e5f3a 100644 --- a/src/core/web_contents_view_qt.cpp +++ b/src/core/web_contents_view_qt.cpp @@ -44,6 +44,7 @@ #include "browser_context_qt.h" #include "content_browser_client_qt.h" #include "render_widget_host_view_qt_delegate.h" +#include "type_conversion.h" #include "web_engine_context.h" #include "content/browser/renderer_host/render_view_host_impl.h" -- cgit v1.2.3