SearchTabHelper: Find browser/window instead of having them passed in

chrome/browser/ui/search/search_tab_helper.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/ui/search/search_tab_helper.h"
 
 #include <memory>
 #include <set>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/omnibox/clipboard_utils.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_ipc_router_policy_impl.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/profile_sync_service.h"
@@ skipping 102 matching lines @@
 }  // namespace
 
 SearchTabHelper::SearchTabHelper(content::WebContents* web_contents)
     : WebContentsObserver(web_contents),
       is_search_enabled_(search::IsInstantExtendedAPIEnabled()),
       web_contents_(web_contents),
       ipc_router_(
           web_contents,
           this,
           base::WrapUnique(new SearchIPCRouterPolicyImpl(web_contents))),
-      instant_service_(nullptr),
-      omnibox_view_(nullptr) {
+      instant_service_(nullptr) {
   if (!is_search_enabled_)
     return;
 
   instant_service_ =
       InstantServiceFactory::GetForProfile(
           Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
   if (instant_service_)
     instant_service_->AddObserver(this);
 }
 
@@ skipping 35 matching lines @@
 void SearchTabHelper::SetSuggestionToPrefetch(
     const InstantSuggestion& suggestion) {
   ipc_router_.SetSuggestionToPrefetch(suggestion);
 }
 
 void SearchTabHelper::Submit(const base::string16& text,
                              const EmbeddedSearchRequestParams& params) {
   ipc_router_.Submit(text, params);
 }
 
-void SearchTabHelper::OnTabAttachedToWindow(BrowserWindow* window) {
-  omnibox_view_ = window->GetLocationBar()->GetOmniboxView();
-}
-
 void SearchTabHelper::OnTabActivated() {
   ipc_router_.OnTabActivated();
 
   if (search::IsInstantNTP(web_contents_)) {
     if (instant_service_)
       instant_service_->OnNewTabPageOpened();
 
     // Force creation of NTPUserDataLogger, if we loaded an NTP. The
     // NTPUserDataLogger tries to detect whether the NTP is being created at
     // startup or from the user opening a new tab, and if we wait until later,
@@ skipping 123 matching lines @@
 }
 
 void SearchTabHelper::MostVisitedItemsChanged(
     const std::vector<InstantMostVisitedItem>& items) {
   ipc_router_.SendMostVisitedItems(items);
 }
 
 void SearchTabHelper::FocusOmnibox(OmniboxFocusState state) {
 // TODO(kmadhusu): Move platform specific code from here and get rid of #ifdef.
 #if !defined(OS_ANDROID)
-  if (!omnibox_view_)
+  OmniboxView* omnibox_view = GetOmniboxView();
+  if (!omnibox_view)
     return;
 
   // Do not add a default case in the switch block for the following reasons:
   // (1) Explicitly handle the new states. If new states are added in the
   // OmniboxFocusState, the compiler will warn the developer to handle the new
   // states.
   // (2) An attacker may control the renderer and sends the browser process a
   // malformed IPC. This function responds to the invalid |state| values by
   // doing nothing instead of crashing the browser process (intentional no-op).
   switch (state) {
     case OMNIBOX_FOCUS_VISIBLE:
-      omnibox_view_->SetFocus();
-      omnibox_view_->model()->SetCaretVisibility(true);
+      omnibox_view->SetFocus();
+      omnibox_view->model()->SetCaretVisibility(true);
       break;
     case OMNIBOX_FOCUS_INVISIBLE:
-      omnibox_view_->SetFocus();
-      omnibox_view_->model()->SetCaretVisibility(false);
+      omnibox_view->SetFocus();
+      omnibox_view->model()->SetCaretVisibility(false);
       // If the user clicked on the fakebox, any text already in the omnibox
       // should get cleared when they start typing. Selecting all the existing
       // text is a convenient way to accomplish this. It also gives a slight
       // visual cue to users who really understand selection state about what
       // will happen if they start typing.
-      omnibox_view_->SelectAll(false);
-      omnibox_view_->ShowImeIfNeeded();
+      omnibox_view->SelectAll(false);
+      omnibox_view->ShowImeIfNeeded();
       break;
     case OMNIBOX_FOCUS_NONE:
       // Remove focus only if the popup is closed. This will prevent someone
       // from changing the omnibox value and closing the popup without user
       // interaction.
-      if (!omnibox_view_->model()->popup_model()->IsOpen())
+      if (!omnibox_view->model()->popup_model()->IsOpen())
         web_contents()->Focus();
       break;
   }
 #endif
 }
 
 void SearchTabHelper::OnDeleteMostVisitedItem(const GURL& url) {
   DCHECK(!url.is_empty());
   if (instant_service_)
     instant_service_->DeleteMostVisitedItem(url);
@@ skipping 35 matching lines @@
 // TODO(kmadhusu): Move platform specific code from here and get rid of #ifdef.
 #if !defined(OS_ANDROID)
   NTPUserDataLogger::GetOrCreateFromWebContents(
       web_contents())->LogMostVisitedNavigation(position, tile_source);
 #endif
 }
 
 void SearchTabHelper::PasteIntoOmnibox(const base::string16& text) {
 // TODO(kmadhusu): Move platform specific code from here and get rid of #ifdef.
 #if !defined(OS_ANDROID)
-  if (!omnibox_view_)
+  OmniboxView* omnibox_view = GetOmniboxView();
+  if (!omnibox_view)
     return;
   // The first case is for right click to paste, where the text is retrieved
   // from the clipboard already sanitized. The second case is needed to handle
   // drag-and-drop value and it has to be sanitazed before setting it into the
   // omnibox.
-  base::string16 text_to_paste =
-      text.empty() ? GetClipboardText()
-                   : omnibox_view_->SanitizeTextForPaste(text);
+  base::string16 text_to_paste = text.empty()
+                                     ? GetClipboardText()
+                                     : omnibox_view->SanitizeTextForPaste(text);
 
   if (text_to_paste.empty())
     return;
 
-  if (!omnibox_view_->model()->has_focus())
-    omnibox_view_->SetFocus();
+  if (!omnibox_view->model()->has_focus())
+    omnibox_view->SetFocus();
 
-  omnibox_view_->OnBeforePossibleChange();
-  omnibox_view_->model()->OnPaste();
-  omnibox_view_->SetUserText(text_to_paste);
-  omnibox_view_->OnAfterPossibleChange(true);
+  omnibox_view->OnBeforePossibleChange();
+  omnibox_view->model()->OnPaste();
+  omnibox_view->SetUserText(text_to_paste);
+  omnibox_view->OnAfterPossibleChange(true);
 #endif
 }
 
 void SearchTabHelper::OnChromeIdentityCheck(const base::string16& identity) {
   SigninManagerBase* manager = SigninManagerFactory::GetForProfile(profile());
   if (manager) {
     ipc_router_.SendChromeIdentityCheckResult(
         identity,
         gaia::AreEmailsSame(base::UTF16ToUTF8(identity),
                             manager->GetAuthenticatedAccountInfo().email));
@@ skipping 19 matching lines @@
 void SearchTabHelper::UpdateMode(bool update_origin) {
   SearchMode::Type type = SearchMode::MODE_DEFAULT;
   SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT;
   if (IsNTP(web_contents_)) {
     type = SearchMode::MODE_NTP;
     origin = SearchMode::ORIGIN_NTP;
   }
   if (!update_origin)
     origin = model_.mode().origin;
 
-  if (omnibox_view_ && omnibox_view_->model()->user_input_in_progress())
+  OmniboxView* omnibox_view = GetOmniboxView();
+  if (omnibox_view && omnibox_view->model()->user_input_in_progress())
     type = SearchMode::MODE_SEARCH_SUGGESTIONS;
 
   SearchMode old_mode(model_.mode());
   model_.SetMode(SearchMode(type, origin));
   if (old_mode.is_ntp() != model_.mode().is_ntp()) {
     ipc_router_.SetInputInProgress(IsInputInProgress());
   }
 }
 
 void SearchTabHelper::DetermineIfPageSupportsInstant() {
   if (!InInstantProcess(profile(), web_contents_)) {
     // The page is not in the Instant process. This page does not support
     // instant. If we send an IPC message to a page that is not in the Instant
     // process, it will never receive it and will never respond. Therefore,
     // return immediately.
     InstantSupportChanged(false);
   } else if (IsLocal(web_contents_)) {
     // Local pages always support Instant.
     InstantSupportChanged(true);
   } else {
     ipc_router_.DetermineIfPageSupportsInstant();
   }
 }
 
+const OmniboxView* SearchTabHelper::GetOmniboxView() const {
+#if defined(OS_ANDROID)
+  return nullptr;
+#else
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
+  if (!browser)
+    return nullptr;
+
+  return browser->window()->GetLocationBar()->GetOmniboxView();
+#endif  // OS_ANDROID
+}
+
+OmniboxView* SearchTabHelper::GetOmniboxView() {
+  return const_cast<OmniboxView*>(
+      const_cast<const SearchTabHelper*>(this)->GetOmniboxView());
+}
+
 Profile* SearchTabHelper::profile() const {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 bool SearchTabHelper::IsInputInProgress() const {
-  return !model_.mode().is_ntp() && omnibox_view_ &&
-         omnibox_view_->model()->focus_state() == OMNIBOX_FOCUS_VISIBLE;
+  if (model_.mode().is_ntp())
+    return false;
+  const OmniboxView* omnibox_view = GetOmniboxView();
+  return omnibox_view &&
+         omnibox_view->model()->focus_state() == OMNIBOX_FOCUS_VISIBLE;
 }