Instant: Make clicks on Most Visited items work.

chrome/browser/instant/instant_controller.cc

 // Copyright 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/instant/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 590 matching lines @@
   // There may re-entrance here, from the call to browser_->CommitInstant below,
   // which can cause a TabDeactivated notification which gets back here.
   // In this case, overlay_->ReleaseContents() was called already.
   if (!GetOverlayContents())
     return false;
 
   // Never commit the local overlay.
   if (overlay_->IsUsingLocalOverlay())
     return false;
 
-  if (type == INSTANT_COMMIT_FOCUS_LOST)
-    overlay_->Cancel(last_omnibox_text_);
-  else if (type != INSTANT_COMMIT_NAVIGATED)
+  if (type == INSTANT_COMMIT_FOCUS_LOST) {
+    // Extended mode doesn't need or use the Cancel message.
+    if (!extended_enabled_)
+      overlay_->Cancel(last_omnibox_text_);
+  } else if (type != INSTANT_COMMIT_NAVIGATED) {
     overlay_->Submit(last_omnibox_text_);
+  }
 
   scoped_ptr<content::WebContents> overlay = overlay_->ReleaseContents();
 
   // If the overlay page has navigated since the last Update(), we need to add
   // the navigation to history ourselves. Else, the page will navigate after
   // commit, and it will be added to history in the usual manner.
   const history::HistoryAddPageArgs& last_navigation =
       overlay_->last_navigation();
   if (!last_navigation.url.is_empty()) {
     content::NavigationEntry* entry = overlay->GetController().GetActiveEntry();
@@ skipping 854 matching lines @@
     overlay_->SendMostVisitedItems(items);
   if (ntp_)
     ntp_->SendMostVisitedItems(items);
   if (instant_tab_)
     instant_tab_->SendMostVisitedItems(items);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
 }