Moved theme related state from BrowserInstantController to InstantService.

chrome/browser/ui/search/search_tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/common/instant_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace content {
 class WebContents;
 }
@@ skipping 21 matching lines @@
   // affect the search mode. This is used by Instant when it "fixes up" the
   // virtual URL of the active entry. Regular navigations are captured through
   // the notification system and shouldn't call this method.
   void NavigationEntryUpdated();
 
   // Updates |last_known_most_visited_items_| with |items|.
   // Returns false if |items| matches the |last_known_most_visited_items_|.
   bool UpdateLastKnownMostVisitedItems(
       const std::vector<InstantMostVisitedItem>& items);
 
+  // Updates |last_known_theme_info_| with |theme_info|.
+  // Returns false if |theme_info| matches the |last_known_theme_info_|.
+  bool UpdateLastKnownThemeBackgroundInfo(
+      const ThemeBackgroundInfo& theme_info);
+
  private:
   friend class content::WebContentsUserData<SearchTabHelper>;
 
   explicit SearchTabHelper(content::WebContents* web_contents);
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
@@ skipping 19 matching lines @@
   SearchModel model_;
 
   content::NotificationRegistrar registrar_;
 
   content::WebContents* web_contents_;
 
   // Tracks the last set of most visited items sent to the InstantPage renderer.
   // Used to prevent sending duplicate IPC messages to the renderer.
   std::vector<InstantMostVisitedItem> last_known_most_visited_items_;
 
+  // Tracks the last known theme background details.
+  scoped_ptr<ThemeBackgroundInfo> last_known_theme_info_;

[samarth, 2013/06/19 18:30:02]

As discussed offline, let's track this in the renderer. So we'll always send an
IPC from InstantController in ThemeInfoChanged(). The renderer (searchbox.cc)
should then make sure we don't send duplicate events.

If this works, we can make the same change for most visited.

[kmadhusu, 2013/06/19 21:31:01]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_