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/app_window_contents.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/app_window_contents.cc')
| -rw-r--r-- | apps/app_window_contents.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc index 7b88e67..56ae403 100644 --- a/apps/app_window_contents.cc +++ b/apps/app_window_contents.cc @@ -60,16 +60,15 @@ void AppWindowContents::LoadContents(int32 creator_process_id) { } // TODO(jeremya): there's a bug where navigating a web contents to an - // extension URL causes it to create a new RVH and discard the old - // (perfectly usable) one. To work around this, we watch for a RVH_CHANGED - // message from the web contents (which will be sent during LoadURL) and - // suspend resource requests on the new RVH to ensure that we block the new - // RVH from loading anything. It should be okay to remove the - // NOTIFICATION_RVH_CHANGED registration once http://crbug.com/123007 is - // fixed. + // extension URL causes it to create a new RVH and discard the old (perfectly + // usable) one. To work around this, we watch for a + // NOTIFICATION_RENDER_VIEW_HOST_CHANGED message from the web contents (which + // will be sent during LoadURL) and suspend resource requests on the new RVH + // to ensure that we block the new RVH from loading anything. It should be + // okay to remove the NOTIFICATION_RENDER_VIEW_HOST_CHANGED registration once + // http://crbug.com/123007 is fixed. registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, - content::Source<content::NavigationController>( - &web_contents()->GetController())); + content::Source<content::WebContents>(web_contents())); web_contents_->GetController().LoadURL( url_, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); |