Instant API: tell page whether the browser is capturing key strokes.

chrome/browser/instant/instant_browsertest.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/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_model_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 84 matching lines @@
 
   void KillInstantRenderView() {
     base::KillProcess(
         instant()->GetPreviewContents()->GetRenderProcessHost()->GetHandle(),
         content::RESULT_CODE_KILLED,
         false);
   }
 
   void FocusOmnibox() {
     // If the omnibox already has focus, just notify Instant.
-    if (omnibox()->model()->has_focus())
-      instant()->OmniboxGotFocus();
-    else
+    if (omnibox()->model()->has_focus()) {
+      instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_VISIBLE,
+                                     OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
+    }
+    else {
       browser()->window()->GetLocationBar()->FocusLocation(false);
+    }
   }
 
   void FocusOmniboxAndWaitForInstantSupport() {
     content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
         content::NotificationService::AllSources());
     FocusOmnibox();
     observer.Wait();
   }
 
@@ skipping 552 matching lines @@
   content::WebContents* preview_tab = instant()->GetPreviewContents();
   EXPECT_TRUE(preview_tab);
 
   // Type a URL. This causes the preview to be hidden.
   SetOmniboxText("http://hideous/zippleback");
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Pretend the omnibox got focus. It already had focus, so we are just trying
   // to tickle a different code path.
-  instant()->OmniboxGotFocus();
+  instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_VISIBLE,
+                                 OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
 
   // Commit the URL. As before, check that Instant wasn't committed.
   browser()->window()->GetLocationBar()->AcceptInput();
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_NE(preview_tab, active_tab);
   EXPECT_EQ(ASCIIToUTF16("hideous/zippleback"), omnibox()->GetText());
 
   // As before, Instant shouldn't have done anything.
   EXPECT_EQ(preview_tab, instant()->GetPreviewContents());
@@ skipping 198 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
 
   // The preview is refreshed only after all three conditions above are met.
   SetOmniboxTextAndWaitForInstantToShow("query");
   instant()->stale_loader_timer_.Stop();
   instant()->OnStaleLoader();
   EXPECT_TRUE(instant()->loader_->supports_instant());
   instant()->HideLoader();
   EXPECT_TRUE(instant()->loader_->supports_instant());
-  instant()->OmniboxLostFocus(NULL);
+  instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
+                                 OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
   EXPECT_FALSE(instant()->loader_->supports_instant());
 
   // Try with a different ordering.
   SetOmniboxTextAndWaitForInstantToShow("query");
   instant()->stale_loader_timer_.Stop();
   instant()->OnStaleLoader();
   EXPECT_TRUE(instant()->loader_->supports_instant());
-  instant()->OmniboxLostFocus(NULL);
+  instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
+                                 OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
   // TODO(sreeram): Currently, OmniboxLostFocus() calls HideLoader(). When it
   // stops hiding the preview eventually, uncomment these two lines:
   //     EXPECT_TRUE(instant()->loader_->supports_instant());
   //     instant()->HideLoader();
   EXPECT_FALSE(instant()->loader_->supports_instant());
 }
 
 // Test that suggestions are case insensitive. http://crbug.com/150728
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionsAreCaseInsensitive) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
@@ skipping 159 matching lines @@
   SetOmniboxTextAndWaitForInstantToShow("q");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 
   // Kill the instant renderer and wait for instant support again.
   KillInstantRenderView();
   FocusOmniboxAndWaitForInstantSupport();
 
   SetOmniboxTextAndWaitForInstantToShow("qu");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 }