Moved theme related state from BrowserInstantController to InstantService.

chrome/browser/ui/search/instant_controller.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_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/search/instant_commit_type.h"
 #include "chrome/browser/ui/search/instant_overlay_model.h"
 #include "chrome/browser/ui/search/instant_page.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "chrome/common/search_types.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 struct AutocompleteMatch;
 struct InstantAutocompleteResult;
 
 class AutocompleteProvider;
 class AutocompleteResult;
 class BrowserInstantController;
 class InstantNTP;
 class InstantOverlay;
+class InstantService;
 class InstantTab;
 class TemplateURL;
 
 namespace content {
 class WebContents;
 }
 
 // Macro used for logging debug events. |message| should be a std::string.
 #define LOG_INSTANT_DEBUG_EVENT(controller, message) \
     controller->LogDebugEvent(message)
 
 // InstantController drives Chrome Instant, i.e., the browser implementation of
 // the Embedded Search API (see http://dev.chromium.org/embeddedsearch).
 //
 // In extended mode, InstantController maintains and coordinates three
 // instances of InstantPage:
 //  (1) An InstantOverlay instance that is used to show search suggestions and
 //      results in an overlay over a non-search page.
 //  (2) An InstantNTP instance which is a preloaded search page that will be
 //      swapped-in the next time the user navigates to the New Tab Page. It is
 //      never shown to the user in an uncommitted state.
 //  (3) An InstantTab instance which points to the currently active tab, if it
 //      supports the Embedded Search API.
 //
 // All three are backed by a WebContents. InstantOverlay and InstantNTP own
 // their corresponding WebContents; InstantTab does not. In non-extended mode,
 // only an InstantOverlay instance is kept.
 //
 // InstantController is owned by Browser via BrowserInstantController.
-class InstantController : public InstantPage::Delegate {
+class InstantController : public InstantPage::Delegate,
+                          public InstantServiceObserver {
  public:
   // For reporting fallbacks to local overlay.
   enum InstantFallbackReason {
     INSTANT_FALLBACK_NONE = 0,
     INSTANT_FALLBACK_UNKNOWN = 1,
     INSTANT_FALLBACK_INSTANT_URL_EMPTY = 2,
     INSTANT_FALLBACK_ORIGIN_PATH_MISMATCH = 3,
     INSTANT_FALLBACK_INSTANT_NOT_SUPPORTED = 4,
     INSTANT_FALLBACK_NO_OVERLAY = 5,
     INSTANT_FALLBACK_MAX = 6,
@@ skipping 106 matching lines @@
   void ActiveTabChanged();
 
   // The user is about to switch tabs. Commit the overlay if needed.
   void TabDeactivated(content::WebContents* contents);
 
   // Sets whether Instant should show result overlays. |use_local_page_only|
   // will force the use of baked-in page as the Instant URL and is only
   // applicable if |extended_enabled_| is true.
   void SetInstantEnabled(bool instant_enabled, bool use_local_page_only);
 
-  // The theme has changed. Pass the message to the overlay page.
-  void ThemeChanged(const ThemeBackgroundInfo& theme_info);
+  // Overridden from InstantServiceObserver:

[samarth, 2013/06/19 05:34:54]

This can be private I think.

[kmadhusu, 2013/06/19 17:43:30]

Done.

+  virtual void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) OVERRIDE;
 
   // Called when someone else swapped in a different contents in the |overlay_|.
   void SwappedOverlayContents();
 
   // Called when contents for |overlay_| received focus.
   void FocusedOverlayContents();
 
   // Called when the |overlay_| might be stale. If it's actually stale, and the
   // omnibox doesn't have focus, and the overlay isn't showing, the |overlay_|
   // is deleted and recreated. Else the refresh is skipped.
@@ skipping 227 matching lines @@
 
   // Populates InstantAutocompleteResult with AutocompleteMatch details.
   // |autocomplete_match_index| specifies the index of |match| in the
   // AutocompleteResult. If the |match| is obtained from auto complete
   // providers, then the |autocomplete_match_index| is set to kNoMatchIndex.
   void PopulateInstantAutocompleteResultFromMatch(
       const AutocompleteMatch& match,
       size_t autocomplete_match_index,
       InstantAutocompleteResult* result);
 
+  // Returns the InstantService for the browser profile.
+  InstantService* GetInstantService() const;
+
   BrowserInstantController* const browser_;
 
   // Whether the extended API and regular API are enabled. If both are false,
   // Instant is effectively disabled.
   const bool extended_enabled_;
   bool instant_enabled_;
 
   // If true, the Instant URL is set to kChromeSearchLocalNtpUrl.
   bool use_local_page_only_;
 
@@ skipping 88 matching lines @@
   // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
   bool allow_overlay_to_show_search_suggestions_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64, std::string> > debug_events_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_