diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 00:57:28 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 00:57:28 +0000 |
| commit | 7b712ee2b7375ceb1b99913749623cd3dd2b664c (patch) | |
| tree | b360fc19a0aed3d6f7022847ed5b6b981b7b4b21 /apps/shell_window.cc | |
| parent | 6369bda963cc9c5a12f29f36ece63943bad19191 (diff) | |
| download | chromium_src-7b712ee2b7375ceb1b99913749623cd3dd2b664c.zip chromium_src-7b712ee2b7375ceb1b99913749623cd3dd2b664c.tar.gz chromium_src-7b712ee2b7375ceb1b99913749623cd3dd2b664c.tar.bz2 | |
Merge NOTIFICATION_WEB_CONTENTS_SWAPPED into NOTIFICATION_RENDER_VIEW_HOST_CHANGED.
NOTIFICATION_WEB_CONTENTS_SWAPPED was fired in a strict subset of times that NOTIFICATION_RENDER_VIEW_HOST_CHANGED was fired, but everyone was listening for NOTIFICATION_WEB_CONTENTS_SWAPPED since it showed up in the types file first.
BUG=170921,123007
TEST=no functional change
Review URL: https://codereview.chromium.org/23618036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell_window.cc')
| -rw-r--r-- | apps/shell_window.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/shell_window.cc b/apps/shell_window.cc index 4317883..99c330c 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -183,9 +183,6 @@ void ShellWindow::Init(const GURL& url, // about it in case it has any setup to do to make the renderer appear // properly. In particular, on Windows, the view's clickthrough region needs // to be set. - registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, - content::Source<content::NavigationController>( - &web_contents->GetController())); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, content::Source<Profile>(profile_)); // Close when the browser process is exiting. @@ -543,13 +540,6 @@ void ShellWindow::Observe(int type, const content::NotificationSource& source, const content::NotificationDetails& details) { switch (type) { - case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED: { - // TODO(jianli): once http://crbug.com/123007 is fixed, we'll no longer - // need to make the native window (ShellWindowViews specially) update - // the clickthrough region for the new RVH. - native_app_window_->RenderViewHostChanged(); - break; - } case chrome::NOTIFICATION_EXTENSION_UNLOADED: { const extensions::Extension* unloaded_extension = content::Details<extensions::UnloadedExtensionInfo>( |