diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 21:11:36 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 21:11:36 +0000 |
| commit | a85e7ce06cebd2cc0c9422113d9fdc24109b33f9 (patch) | |
| tree | ba122099280d3a009ce4cb646329fc57ffa19349 /content | |
| parent | b4c1725ee9845e8e64a2665282d08a5b63f92b0e (diff) | |
| download | chromium_src-a85e7ce06cebd2cc0c9422113d9fdc24109b33f9.zip chromium_src-a85e7ce06cebd2cc0c9422113d9fdc24109b33f9.tar.gz chromium_src-a85e7ce06cebd2cc0c9422113d9fdc24109b33f9.tar.bz2 | |
Beginnings of a WebView.
http://crbug.com/105557
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10024081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/shell_browser_context.cc | 5 | ||||
| -rw-r--r-- | content/shell/shell_browser_context.h | 4 | ||||
| -rw-r--r-- | content/shell/shell_browser_main_parts.cc | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc index 4765860..8c82453 100644 --- a/content/shell/shell_browser_context.cc +++ b/content/shell/shell_browser_context.cc @@ -14,7 +14,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/geolocation_permission_context.h" #include "content/public/browser/speech_recognition_preferences.h" -#include "content/shell/shell_browser_main_parts.h" #include "content/shell/shell_download_manager_delegate.h" #include "content/shell/shell_resource_context.h" #include "content/shell/shell_url_request_context_getter.h" @@ -84,9 +83,7 @@ class ShellSpeechRecognitionPreferences : public SpeechRecognitionPreferences { } // namespace -ShellBrowserContext::ShellBrowserContext( - ShellBrowserMainParts* shell_main_parts) - : shell_main_parts_(shell_main_parts) { +ShellBrowserContext::ShellBrowserContext() { InitWhileIOAllowed(); } diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h index 11220b0..c2eaadc 100644 --- a/content/shell/shell_browser_context.h +++ b/content/shell/shell_browser_context.h @@ -23,7 +23,7 @@ class ShellDownloadManagerDelegate; class ShellBrowserContext : public BrowserContext { public: - explicit ShellBrowserContext(ShellBrowserMainParts* shell_main_parts); + ShellBrowserContext(); virtual ~ShellBrowserContext(); // BrowserContext implementation. @@ -55,8 +55,6 @@ class ShellBrowserContext : public BrowserContext { scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_; scoped_refptr<SpeechRecognitionPreferences> speech_recognition_preferences_; - ShellBrowserMainParts* shell_main_parts_; - DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext); }; diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index a3fb53c..1074388 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -49,7 +49,7 @@ int ShellBrowserMainParts::PreCreateThreads() { } void ShellBrowserMainParts::PreMainMessageLoopRun() { - browser_context_.reset(new ShellBrowserContext(this)); + browser_context_.reset(new ShellBrowserContext); Shell::PlatformInitialize(); net::NetModule::SetResourceProvider(Shell::PlatformResourceProvider); |