diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 23:36:36 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 23:36:36 +0000 |
commit | db40ea35cb5164f68f3ed1ed49eb47c2ac287180 (patch) | |
tree | f7c3a40eebec0c62d36ee3a09418dfc97ccf8af7 /apps | |
parent | 59e0cc94d4845991bc6fc42c19fc56523fdc9f8a (diff) | |
download | chromium_src-db40ea35cb5164f68f3ed1ed49eb47c2ac287180.zip chromium_src-db40ea35cb5164f68f3ed1ed49eb47c2ac287180.tar.gz chromium_src-db40ea35cb5164f68f3ed1ed49eb47c2ac287180.tar.bz2 |
Get rid of the extensions' MessageHandler RenderViewHostObserver. Move this code to ExtensionWebContentsObserver instead as part of removing RenderViewHostObserver.
I created ExtensionWebContentsObserver for a few more WebContents' that called extensions::SetViewType.
BUG=306569
R=benwells@chromium.org, mpcomplete@chromium.org
Review URL: https://codereview.chromium.org/31633006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r-- | apps/DEPS | 1 | ||||
-rw-r--r-- | apps/shell_window.cc | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -40,6 +40,7 @@ include_rules = [ "+chrome/browser/extensions/extension_service.h", "+chrome/browser/extensions/extension_system.h", "+chrome/browser/extensions/extension_system_factory.h", + "+chrome/browser/extensions/extension_web_contents_observer.h", "+chrome/browser/extensions/lazy_background_task_queue.h", "+chrome/browser/extensions/suggest_permission_util.h", "+chrome/browser/extensions/unpacked_installer.h", diff --git a/apps/shell_window.cc b/apps/shell_window.cc index ce2efa0..2b169d0 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -13,6 +13,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" @@ -154,6 +155,7 @@ void ShellWindow::Init(const GURL& url, WebContents* web_contents = shell_window_contents_->GetWebContents(); delegate_->InitWebContents(web_contents); WebContentsModalDialogManager::CreateForWebContents(web_contents); + extensions::ExtensionWebContentsObserver::CreateForWebContents(web_contents); web_contents->SetDelegate(this); WebContentsModalDialogManager::FromWebContents(web_contents)-> |