alternate ntp: implement searchbox api for instant overlay to adopt themes

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 543 matching lines @@
     loader_->OnActiveTabModeChanged(new_mode.is_ntp());
     // On navigation away from the NTP, hide custom content. However keep
     // the preview shown if searching, since it will soon show a suggestions
     // dropdown and hiding it would cause flicker.
     if (new_mode.is_default() &&
         model_.preview_state() == InstantModel::CUSTOM_NTP_CONTENT)
       Hide();
   }
 }
 
+void InstantController::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
+  if (loader_.get())

[sreeram, 2012/11/19 18:12:02]

Use "if (GetPreviewContents())" instead of "if (loader_.get())", here and on
line 570 below. The rationale is that, in the off chance that the loader has
released its preview contents and we get here (say because of something
browser_->CommitInstant() does), it won't crash.

[kuan, 2012/11/19 22:06:07]

Done.

+    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();
 }
 
 void InstantController::SetSuggestions(
     InstantLoader* loader,
     const std::vector<InstantSuggestion>& suggestions) {
   if (loader_ != loader || model_.preview_state() == InstantModel::NOT_READY)
     return;
 
@@ skipping 111 matching lines @@
 
 void InstantController::ResetLoader(const std::string& instant_url,
                                     const TabContents* active_tab) {
   if (GetPreviewContents() && loader_->instant_url() != instant_url)
     DeleteLoader();
 
   if (!GetPreviewContents()) {
     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.
     loader_->OnActiveTabModeChanged(active_tab_mode_.is_ntp());
+    browser_->UpdateThemeRelatedInfoForPreview();

[sreeram, 2012/11/19 18:12:02]

Nit: "related" seems unnecessary. Just "UpdateThemeInfoForPreview".

[kuan, 2012/11/19 22:06:07]

Done.

 
     // Reset the loader timer.
     stale_loader_timer_.Stop();
     stale_loader_timer_.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(kStaleLoaderTimeoutMS), this,
         &InstantController::OnStaleLoader);
   }
 }
 
@@ skipping 147 matching lines @@
   }
 
   std::map<std::string, int>::const_iterator iter =
       blacklisted_urls_.find(*instant_url);
   if (iter != blacklisted_urls_.end() &&
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }