| Index: chrome/browser/instant/instant_controller.cc
|
| diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
|
| index 04c95cef2697c01f0ec567df0acf80c01a8b2653..91eee5d6e2a80a652a3d6023075bf559b86a7d46 100644
|
| --- a/chrome/browser/instant/instant_controller.cc
|
| +++ b/chrome/browser/instant/instant_controller.cc
|
| @@ -565,6 +565,16 @@ void InstantController::OnActiveTabModeChanged(chrome::search::Mode new_mode) {
|
| }
|
| }
|
|
|
| +void InstantController::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
|
| + if (loader_.get())
|
| + loader_->SendThemeBackgroundInfo(theme_info);
|
| +}
|
| +
|
| +void InstantController::OnThemeAreaHeightChanged(int height) {
|
| + if (loader_.get())
|
| + loader_->SendThemeAreaHeight(height);
|
| +}
|
| +
|
| bool InstantController::commit_on_pointer_release() const {
|
| return GetPreviewContents() && loader_->IsPointerDownFromActivate();
|
| }
|
| @@ -696,12 +706,14 @@ void InstantController::ResetLoader(const std::string& instant_url,
|
| loader_.reset(new InstantLoader(this, instant_url, active_tab));
|
| loader_->Init();
|
|
|
| - // Ensure the searchbox API has the correct focus state and context.
|
| + // Ensure the searchbox API has the correct focus state, context and theme-
|
| + // related info.
|
| if (is_omnibox_focused_)
|
| loader_->OnAutocompleteGotFocus();
|
| else
|
| loader_->OnAutocompleteLostFocus();
|
| loader_->OnActiveTabModeChanged(active_tab_mode_.is_ntp());
|
| + browser_->UpdateThemeRelatedInfoForPreview();
|
|
|
| // Reset the loader timer.
|
| stale_loader_timer_.Stop();
|
|
|