diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 21:20:42 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 21:20:42 +0000 |
| commit | f46186424021ba2d70ce2c1626da43572bff43d0 (patch) | |
| tree | 6f34c140d35ed82858c693049f9215d7ab5cfac9 /chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc | |
| parent | 97e6692430f166051246395802a26c6b325b54a4 (diff) | |
| download | chromium_src-f46186424021ba2d70ce2c1626da43572bff43d0.zip chromium_src-f46186424021ba2d70ce2c1626da43572bff43d0.tar.gz chromium_src-f46186424021ba2d70ce2c1626da43572bff43d0.tar.bz2 | |
Revert 210036 "InstantExtended: Remove overlay control code."
Broke the http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/55501/steps/compile/logs/stdio build, and probably all enable_rlz=1 builds.
> InstantExtended: Remove overlay control code.
>
> This change deletes the browser-side InstantController code pertaining
> to old Instant, the HTML popup and search results overlay. A lot of UI
> and renderer code is still lingering and doing nothing, but I'll get
> that in another CL.
>
> TEST=Manually. Verify that InstantExtended NTP and searching works, and
> that normal Chrome is unaffected.
> BUG=251262
> TBR=brettw@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/18223002
TBR=jered@chromium.org
Review URL: https://codereview.chromium.org/18654004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc')
| -rw-r--r-- | chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc b/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc index 2b302c0..c6e6d63 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc +++ b/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc @@ -29,6 +29,8 @@ AlternateNavURLFetcher::AlternateNavURLFetcher( navigated_to_entry_(false) { registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING, content::NotificationService::AllSources()); + registrar_.Add(this, chrome::NOTIFICATION_INSTANT_COMMITTED, + content::NotificationService::AllSources()); } AlternateNavURLFetcher::~AlternateNavURLFetcher() { @@ -58,6 +60,19 @@ void AlternateNavURLFetcher::Observe( break; } + case chrome::NOTIFICATION_INSTANT_COMMITTED: { + // See above. + NavigationController* controller = + &content::Source<content::WebContents>(source)->GetController(); + if (controller_ == controller) { + delete this; + } else if (!controller_) { + navigated_to_entry_ = true; + StartFetch(controller); + } + break; + } + case content::NOTIFICATION_NAV_ENTRY_COMMITTED: // The page was navigated, we can show the infobar now if necessary. registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, |