| Index: chrome/browser/ui/search/instant_controller.h
|
| diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
|
| index cdb170bc55056603a11d19153bc4153811765d35..0caac6ea4044b749b340febec230c31aa14ec48f 100644
|
| --- a/chrome/browser/ui/search/instant_controller.h
|
| +++ b/chrome/browser/ui/search/instant_controller.h
|
| @@ -16,6 +16,7 @@
|
| #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"
|
| @@ -66,7 +67,8 @@ class WebContents;
|
| // 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 {
|
| @@ -193,8 +195,8 @@ class InstantController : public InstantPage::Delegate {
|
| // 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:
|
| + virtual void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) OVERRIDE;
|
|
|
| // Called when someone else swapped in a different contents in the |overlay_|.
|
| void SwappedOverlayContents();
|
| @@ -243,6 +245,10 @@ class InstantController : public InstantPage::Delegate {
|
| // happen through the InstantController interface.
|
| InstantOverlayModel* model() { return &model_; }
|
|
|
| + // Sends a request to InstantService to update the InstantServiceObservers
|
| + // about the theme background information.
|
| + void UpdateThemeInfo();
|
| +
|
| protected:
|
| // Accessors are made protected for testing purposes.
|
| virtual bool extended_enabled() const;
|
|
|