diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-26 00:10:55 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-26 00:10:55 +0000 |
| commit | 45a73d53720ac714934393f3c04f5a37335cad7b (patch) | |
| tree | e037db7dab6c2463f30855ee888f1ba6f052e5eb /extensions | |
| parent | 7612a848db4b40477ac6fd6bc0f4b9cdcf421751 (diff) | |
| download | chromium_src-45a73d53720ac714934393f3c04f5a37335cad7b.zip chromium_src-45a73d53720ac714934393f3c04f5a37335cad7b.tar.gz chromium_src-45a73d53720ac714934393f3c04f5a37335cad7b.tar.bz2 | |
Extract UI dependencies from ExtensionHost, part 1
app_shell needs to support background pages in order to load apps, but doesn't
have the usual UI surfaces for Chrome extensions (popups, infobars, etc.).
* Extract functionality touching platform-specific views to ExtensionViewHost
* Remove references to panels, which don't use ExtensionHost
Reupload of LGTM'd change https://codereview.chromium.org/82163002 because
AppEngine is misbehaving.
BUG=321341
TEST=browser_tests, interactive_ui_tests
TBR=yoz@chromium.org
Review URL: https://codereview.chromium.org/86363003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/DEPS | 1 | ||||
| -rw-r--r-- | extensions/browser/process_manager.cc | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index 34ce5b9..a06d5d4 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -13,7 +13,6 @@ include_rules = [ "+chrome/browser/extensions/extension_function_dispatcher.h", "+chrome/browser/extensions/extension_function_histogram_value.h", "+chrome/browser/extensions/extension_host.h", - "+chrome/browser/extensions/extension_host_mac.h", "+chrome/browser/extensions/extension_prefs.h", "+chrome/browser/extensions/extension_service.h", "+chrome/browser/extensions/extension_system.h", diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc index cccb800..a1ee794 100644 --- a/extensions/browser/process_manager.cc +++ b/extensions/browser/process_manager.cc @@ -40,10 +40,6 @@ #include "extensions/common/manifest_handlers/incognito_info.h" #include "extensions/common/switches.h" -#if defined(OS_MACOSX) -#include "chrome/browser/extensions/extension_host_mac.h" -#endif - using content::BrowserContext; using content::RenderViewHost; using content::SiteInstance; @@ -238,7 +234,6 @@ const ProcessManager::ViewSet ProcessManager::GetAllViews() const { ExtensionHost* ProcessManager::CreateBackgroundHost(const Extension* extension, const GURL& url) { - DVLOG(1) << "CreateBackgroundHost " << url.spec(); // Hosted apps are taken care of from BackgroundContentsService. Ignore them // here. if (extension->is_hosted_app()) @@ -249,15 +244,8 @@ ExtensionHost* ProcessManager::CreateBackgroundHost(const Extension* extension, return host; // TODO(kalman): return NULL here? It might break things... ExtensionHost* host = -#if defined(OS_MACOSX) - new ExtensionHostMac( - extension, GetSiteInstanceForURL(url), url, - VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); -#else new ExtensionHost(extension, GetSiteInstanceForURL(url), url, VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); -#endif - host->CreateRenderViewSoon(); OnBackgroundHostCreated(host); return host; |