InstantExtended: Remove overlay control code.

chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h"
 
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h"
@@ skipping 11 matching lines @@
 using content::NavigationController;
 
 AlternateNavURLFetcher::AlternateNavURLFetcher(
     const GURL& alternate_nav_url)
     : alternate_nav_url_(alternate_nav_url),
       controller_(NULL),
       state_(NOT_STARTED),
       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() {
 }
 
 void AlternateNavURLFetcher::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
       // If we've already received a notification for the same controller, we
       // should delete ourselves as that indicates that the page is being
       // re-loaded so this instance is now stale.
       NavigationController* controller =
           content::Source<NavigationController>(source).ptr();
       if (controller_ == controller) {
         delete this;
       } else if (!controller_) {
         // Start listening for the commit notification.
         DCHECK(controller->GetPendingEntry());
         registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                        content::Source<NavigationController>(
                           controller));
         StartFetch(controller);
       }
       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,
                         content::Source<NavigationController>(controller_));
       navigated_to_entry_ = true;
       ShowInfobarIfPossible();
       // WARNING: |this| may be deleted!
       break;
 
     case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
@@ skipping 64 matching lines @@
 void AlternateNavURLFetcher::ShowInfobarIfPossible() {
   if (navigated_to_entry_ && (state_ == SUCCEEDED)) {
     AlternateNavInfoBarDelegate::Create(
         InfoBarService::FromWebContents(controller_->GetWebContents()),
         alternate_nav_url_);
   } else if (state_ != FAILED) {
     return;
   }
   delete this;
 }