Moved theme related state from BrowserInstantController to InstantService.

chrome/renderer/searchbox/searchbox.cc

 // 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.
 
 #include "chrome/renderer/searchbox/searchbox.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 57 matching lines @@
       selection_start_(0),
       selection_end_(0),
       start_margin_(0),
       is_focused_(false),
       is_key_capture_enabled_(false),
       is_input_in_progress_(false),
       display_instant_results_(false),
       omnibox_font_size_(0),
       autocomplete_results_cache_(kMaxInstantAutocompleteResultItemCacheSize),
       most_visited_items_cache_(kMaxInstantMostVisitedItemCacheSize) {
+  theme_info_.Initialize();
 }
 
 SearchBox::~SearchBox() {
 }
 
 void SearchBox::SetSuggestions(
     const std::vector<InstantSuggestion>& suggestions) {
   if (!suggestions.empty() &&
       suggestions[0].behavior == INSTANT_COMPLETE_REPLACE) {
     SetQuery(suggestions[0].text, true);
@@ skipping 353 matching lines @@
       }
     }
   }
 }
 
 void SearchBox::OnSetDisplayInstantResults(bool display_instant_results) {
   display_instant_results_ = display_instant_results;
 }
 
 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
+  DCHECK(theme_info. IsValid());
+
   theme_info_ = theme_info;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchThemeChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnFontInformationReceived(const string16& omnibox_font,
                                           size_t omnibox_font_size) {
   omnibox_font_ = omnibox_font;
@@ skipping 13 matching lines @@
 void SearchBox::Reset() {
   query_.clear();
   verbatim_ = false;
   query_is_restricted_ = false;
   selection_start_ = 0;
   selection_end_ = 0;
   popup_bounds_ = gfx::Rect();
   start_margin_ = 0;
   is_focused_ = false;
   is_key_capture_enabled_ = false;
+
   theme_info_ = ThemeBackgroundInfo();
+  theme_info_.Initialize();
+
   // Don't reset display_instant_results_ to prevent clearing it on committed
   // results pages in extended mode. Otherwise resetting it is a no-op because
   // a new loader is created when it changes; see crbug.com/164662.
   // Also don't reset omnibox_font_ or omnibox_font_size_ since it never
   // changes.
 }
 
 void SearchBox::SetQuery(const string16& query, bool verbatim) {
   query_ = query;
   verbatim_ = verbatim;
@@ skipping 25 matching lines @@
   InstantMostVisitedItem item;
   return GetMostVisitedItemWithID(item_id, &item) ? item.url : GURL();
 }
 
 void SearchBox::OnToggleVoiceSearch() {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchToggleVoiceSearch(
         render_view()->GetWebView()->mainFrame());
   }
 }