Moved theme related state from BrowserInstantController to InstantService.

chrome/renderer/searchbox/searchbox_extension.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_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 888 matching lines @@
       SearchBox::Get(render_view)->display_instant_results();
   DVLOG(1) << render_view << " "
            << "GetDisplayInstantResults: " << display_instant_results;
   args.GetReturnValue().Set(display_instant_results);
 }
 
 // static
 void SearchBoxExtensionWrapper::GetThemeBackgroundInfo(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
-  if (!render_view) return;
+  if (!render_view)
+    return;
 
   DVLOG(1) << render_view << " GetThemeBackgroundInfo";
   const ThemeBackgroundInfo& theme_info =
       SearchBox::Get(render_view)->GetThemeBackgroundInfo();
+  if (!theme_info.IsValid())
+    return;
+
   v8::Handle<v8::Object> info = v8::Object::New();
 
   // The theme background color is in RGBA format "rgba(R,G,B,A)" where R, G and
   // B are between 0 and 255 inclusive, and A is a double between 0 and 1
   // inclusive.
   // This is the CSS "background-color" format.
   // Value is always valid.
   info->Set(v8::String::New("colorRgba"), UTF8ToV8String(
       // Convert the alpha using DoubleToString because StringPrintf will use
       // locale specific formatters (e.g., use , instead of . in German).
@@ skipping 55 matching lines @@
         break;
       case THEME_BKGRND_IMAGE_REPEAT_X:
         tiling = kCSSBackgroundRepeatX;
         break;
       case THEME_BKGRND_IMAGE_REPEAT_Y:
         tiling = kCSSBackgroundRepeatY;
         break;
       case THEME_BKGRND_IMAGE_REPEAT:
         tiling = kCSSBackgroundRepeat;
         break;
+      default:
+        NOTREACHED();
     }
     info->Set(v8::String::New("imageTiling"), UTF8ToV8String(tiling));
 
     // The theme background image height is only valid if |imageUrl| is valid.
     info->Set(v8::String::New("imageHeight"),
               v8::Int32::New(theme_info.image_height));
 
     // The attribution URL is only valid if the theme has attribution logo.
     if (theme_info.has_attribution) {
       info->Set(v8::String::New("attributionUrl"), UTF8ToV8String(
@@ skipping 545 matching lines @@
   Dispatch(frame, kDispatchInputCancelScript);
 }
 
 // static
 void SearchBoxExtension::DispatchToggleVoiceSearch(
     WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchToggleVoiceSearchScript);
 }
 
 }  // namespace extensions_v8