Index: chrome/browser/instant/instant_controller.cc |
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc |
index 09aee030bad29ff4805634404b125bbe49b62af4..f56c13b5d66f5b9461fd8887d6b395593cc5a056 100644 |
--- a/chrome/browser/instant/instant_controller.cc |
+++ b/chrome/browser/instant/instant_controller.cc |
@@ -526,6 +526,16 @@ void InstantController::SetInstantEnabled(bool instant_enabled) { |
DeleteLoader(); |
} |
+void InstantController::ThemeChanged(const ThemeBackgroundInfo& theme_info) { |
+ if (GetPreviewContents()) |
+ loader_->SendThemeBackgroundInfo(theme_info); |
+} |
+ |
+void InstantController::ThemeAreaHeightChanged(int height) { |
+ if (GetPreviewContents()) |
+ loader_->SendThemeAreaHeight(height); |
+} |
+ |
void InstantController::SetSuggestions( |
InstantLoader* loader, |
const std::vector<InstantSuggestion>& suggestions) { |
@@ -645,9 +655,10 @@ bool InstantController::ResetLoader(const TemplateURL* template_url, |
loader_.reset(new InstantLoader(this, instant_url, active_tab)); |
loader_->Init(); |
- // Ensure the searchbox API has the correct context. |
+ // Ensure the searchbox API has the correct context and theme-related info. |
if (extended_enabled_) |
loader_->OnActiveTabModeChanged(search_mode_.is_ntp()); |
+ browser_->UpdateThemeInfoForPreview(); |
sreeram
2012/11/20 18:39:00
Likewise, swap these two lines as well.
kuan
2012/11/20 18:50:48
Done.
|
// Reset the loader timer. |
stale_loader_timer_.Start( |