Moved theme related state from BrowserInstantController to InstantService.

chrome/browser/ui/search/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/ui/search/instant_controller.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 251 matching lines @@
       last_match_was_search_(false),
       omnibox_focus_state_(OMNIBOX_FOCUS_NONE),
       omnibox_focus_change_reason_(OMNIBOX_FOCUS_CHANGE_EXPLICIT),
       omnibox_bounds_(-1, -1, 0, 0),
       allow_overlay_to_show_search_suggestions_(false) {
 
   // When the InstantController lives, the InstantService should live.
   // InstantService sets up profile-level facilities such as the ThemeSource for
   // the NTP.
   // However, in some tests, browser_ may be null.
-  if (browser_)
-    InstantServiceFactory::GetForProfile(browser_->profile());
+  if (browser_) {
+    InstantService* instant_service =
+        InstantServiceFactory::GetForProfile(browser_->profile());
+    instant_service->AddObserver(this);
+  }
 }
 
 InstantController::~InstantController() {
+  if (browser_) {
+    InstantService* instant_service =
+        InstantServiceFactory::GetForProfile(browser_->profile());
+    instant_service->RemoveObserver(this);
+  }
 }
 
 void InstantController::OnAutocompleteStart() {
   if (UseTabForSuggestions() && instant_tab_->supports_instant()) {
     LOG_INSTANT_DEBUG_EVENT(
         this, "OnAutocompleteStart: using InstantTab");
     return;
   }
 
   // Not using |instant_tab_|. Check if overlay is OK to use.
@@ skipping 785 matching lines @@
 
   // Preload the Instant NTP.
   ntp_.reset();
   if (extended_enabled() && preload_ntp_)
     ResetNTP(GetInstantURL());
 
   if (instant_tab_)
     instant_tab_->SetDisplayInstantResults(instant_enabled_);
 }
 
-void InstantController::ThemeChanged(const ThemeBackgroundInfo& theme_info) {
-  if (!extended_enabled())
+void InstantController::ThemeInfoChanged(
+    const ThemeBackgroundInfo& theme_info) {
+  if (!extended_enabled() || !search_mode_.is_ntp())

[samarth, 2013/06/19 00:14:36]

Don't check for search_mode_ here. We'd want to update ntp_ with an updated
theme, even if we're on some random page.

[kmadhusu, 2013/06/19 02:27:24]

Done.

     return;
 
-  if (overlay_)
+  if (overlay_ && GetOverlayContents() &&
+      SearchTabHelper::FromWebContents(overlay_->contents())->
+          UpdateLastKnownThemeBackgroundInfo(theme_info)) {
     overlay_->SendThemeBackgroundInfo(theme_info);
-  if (ntp_)
+  }
+
+  if (ntp_ && ntp_->contents() &&
+      SearchTabHelper::FromWebContents(ntp_->contents())->
+          UpdateLastKnownThemeBackgroundInfo(theme_info)) {
     ntp_->SendThemeBackgroundInfo(theme_info);
-  if (instant_tab_)
+  }
+
+  if (instant_tab_ && instant_tab_->contents() &&
+      SearchTabHelper::FromWebContents(instant_tab_->contents())->
+          UpdateLastKnownThemeBackgroundInfo(theme_info)) {
     instant_tab_->SendThemeBackgroundInfo(theme_info);
+  }
 }
 
 void InstantController::SwappedOverlayContents() {
   model_.SetOverlayContents(GetOverlayContents());
 }
 
 void InstantController::FocusedOverlayContents() {
 #if defined(USE_AURA)
   // On aura the omnibox only receives a focus lost if we initiate the focus
   // change. This does that.
@@ skipping 68 matching lines @@
           UpdateLastKnownMostVisitedItems(items)) {
     instant_tab_->SendMostVisitedItems(items);
   }
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
 }
 
+void InstantController::UpdateThemeInfo() {

[samarth, 2013/06/19 00:14:36]

If UpdateThemeInfo doesn't need to be called from BrowserInstantController, you
can make it private. Or even better, just make a helper to get InstantService
and inline the calls to UpdateThemeInfo

[kmadhusu, 2013/06/19 02:27:24]

Done.

+  InstantService* instant_service =
+      InstantServiceFactory::GetForProfile(profile());
+  if (instant_service)
+    instant_service->UpdateThemeInfo();
+}
+
 void InstantController::DeleteMostVisitedItem(const GURL& url) {
   DCHECK(!url.is_empty());
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
   if (!instant_service)
     return;
 
   instant_service->DeleteMostVisitedItem(url);
 }
 
@@ skipping 33 matching lines @@
 }
 
 // TODO(shishir): We assume that the WebContent's current RenderViewHost is the
 // RenderViewHost being created which is not always true. Fix this.
 void InstantController::InstantPageRenderViewCreated(
     const content::WebContents* contents) {
   if (!extended_enabled())
     return;
 
   // Update theme info so that the page picks it up.
-  browser_->UpdateThemeInfo();
+  UpdateThemeInfo();
 
   // Ensure the searchbox API has the correct initial state.
   if (IsContentsFrom(overlay(), contents)) {
     overlay_->SetDisplayInstantResults(instant_enabled_);
     overlay_->FocusChanged(omnibox_focus_state_, omnibox_focus_change_reason_);
     overlay_->SetOmniboxBounds(omnibox_bounds_);
     overlay_->InitializeFonts();
   } else if (IsContentsFrom(ntp(), contents)) {
     ntp_->SetDisplayInstantResults(instant_enabled_);
     ntp_->SetOmniboxBounds(omnibox_bounds_);
@@ skipping 412 matching lines @@
 
     // Hide the |overlay_| since we are now using |instant_tab_| instead.
     HideOverlay();
   } else {
     instant_tab_.reset();
   }
 }
 
 void InstantController::UpdateInfoForInstantTab() {
   if (instant_tab_) {
-    browser_->UpdateThemeInfo();
+    UpdateThemeInfo();
     instant_tab_->SetDisplayInstantResults(instant_enabled_);
     instant_tab_->SetOmniboxBounds(omnibox_bounds_);
     instant_tab_->InitializeFonts();
     UpdateMostVisitedItems();
     instant_tab_->FocusChanged(omnibox_focus_state_,
                                omnibox_focus_change_reason_);
     instant_tab_->SetInputInProgress(IsInputInProgress());
   }
 }
 
@@ skipping 190 matching lines @@
   result->transition = match.transition;
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
   DVLOG(1) << "    " << result->relevance << " "
       << UTF8ToUTF16(AutocompleteMatchType::ToString(result->type)) << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }