Converts some of the omnibox related classes to support multiple

chrome/browser/ui/views/location_bar/location_bar_view.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/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 60 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(OS_WIN)
+#include "ui/base/native_theme/native_theme_win.h"
+#endif
+
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #include "ui/base/native_theme/native_theme.h"
 #endif
 
 #if defined(USE_AURA)
+#include "ui/base/native_theme/native_theme_aura.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #endif
 
 using content::WebContents;
 using views::View;
 
 namespace {
 
 WebContents* GetWebContentsFromDelegate(LocationBarView::Delegate* delegate) {
@@ skipping 132 matching lines @@
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 
   if (search_model_)
     search_model_->RemoveObserver(this);
 }
 
 void LocationBarView::Init() {
+  // We need to be in a Widget, otherwise GetNativeTheme() may change and we're
+  // not prepared for that.
+  DCHECK(GetWidget());
+
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (mode_ == POPUP) {
     font_ = rb.GetFont(ui::ResourceBundle::BaseFont);
   } else {
     // Use a larger version of the system font.
     font_ = rb.GetFont(ui::ResourceBundle::MediumFont);
   }
 
   // If this makes the font too big, try to make it smaller so it will fit.
   const int height = GetInternalHeight(true);
   while ((font_.GetHeight() > height) && (font_.GetFontSize() > 1))
     font_ = font_.DeriveFont(-1);
 
   location_icon_view_ = new LocationIconView(this);
   AddChildView(location_icon_view_);
   location_icon_view_->SetVisible(true);
   location_icon_view_->set_drag_controller(this);
 
+  const ui::NativeTheme* theme = GetNativeTheme();
+
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
-                       GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT), this);
+                       GetColor(theme, ToolbarModel::EV_SECURE, SECURITY_TEXT),
+                       this);
   AddChildView(ev_bubble_view_);
   ev_bubble_view_->SetVisible(false);
   ev_bubble_view_->set_drag_controller(this);
 
   // URL edit field.
   // View container for URL edit field.
   location_entry_.reset(CreateOmniboxView(this, model_, profile_,
       command_updater_, mode_ == POPUP, this));
   SetLocationEntryFocusable(true);
 
   location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
-      GetColor(ToolbarModel::NONE, TEXT),
+      GetColor(theme, ToolbarModel::NONE, TEXT),
       profile_);
   AddChildView(selected_keyword_view_);
   selected_keyword_view_->SetFont(font_);
   selected_keyword_view_->SetVisible(false);
 
   keyword_hint_view_ = new KeywordHintView(profile_);
   AddChildView(keyword_hint_view_);
   keyword_hint_view_->SetVisible(false);
   keyword_hint_view_->SetFont(font_);
 
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     ContentSettingImageView* content_blocked_view =
         new ContentSettingImageView(static_cast<ContentSettingsType>(i),
                                     kCSBubbleBackgroundImages, this,
                                     font_,
-                                    GetColor(ToolbarModel::NONE, TEXT));
+                                    GetColor(theme, ToolbarModel::NONE, TEXT));
     content_setting_views_.push_back(content_blocked_view);
     AddChildView(content_blocked_view);
     content_blocked_view->SetVisible(false);
   }
 
   zoom_view_ = new ZoomView(model_, delegate_);
   zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON);
   AddChildView(zoom_view_);
 
   web_intents_button_view_ =
       new WebIntentsButtonView(this, kWIBubbleBackgroundImages, font_,
-                               GetColor(ToolbarModel::NONE, TEXT));
+                               GetColor(theme, ToolbarModel::NONE, TEXT));
   AddChildView(web_intents_button_view_);
 
   open_pdf_in_reader_view_ = new OpenPDFInReaderView(this);
   AddChildView(open_pdf_in_reader_view_);
 
   if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
     // Note: condition above means that the star icon is hidden in popups and in
     // the app launcher.
     star_view_ = new StarView(command_updater_);
     AddChildView(star_view_);
@@ skipping 18 matching lines @@
   Update(NULL);
 
   OnChanged();
 }
 
 bool LocationBarView::IsInitialized() const {
   return location_entry_view_ != NULL;
 }
 
 // static
-SkColor LocationBarView::GetColor(ToolbarModel::SecurityLevel security_level,
+SkColor LocationBarView::GetColor(const ui::NativeTheme* theme,
+                                  ToolbarModel::SecurityLevel security_level,
                                   ColorKind kind) {
+#if defined(OS_WIN)
+  if (theme == ui::NativeThemeWin::instance()) {
+    switch (kind) {
+      case BACKGROUND:
+        return color_utils::GetSysSkColor(COLOR_WINDOW);
+      case TEXT:
+        return color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
+      case SELECTED_TEXT:
+        return color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
+      default:
+        // Other cases are handled below.
+        break;
+    }
+  }
+#endif
   switch (kind) {
-#if defined(OS_WIN)
-    case BACKGROUND:    return color_utils::GetSysSkColor(COLOR_WINDOW);
-    case TEXT:          return color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
-    case SELECTED_TEXT: return color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
-#else
     // TODO(beng): source from theme provider.
     case BACKGROUND:    return kOmniboxBackgroundColor;
     case TEXT:          return SK_ColorBLACK;
     case SELECTED_TEXT: return SK_ColorWHITE;
-#endif
 
     case DEEMPHASIZED_TEXT:
       return color_utils::AlphaBlend(
-          GetColor(security_level, TEXT),
-          GetColor(security_level, BACKGROUND),
+          GetColor(theme, security_level, TEXT),
+          GetColor(theme, security_level, BACKGROUND),
           128);
 
     case SECURITY_TEXT: {
       SkColor color;
       switch (security_level) {
         case ToolbarModel::EV_SECURE:
         case ToolbarModel::SECURE:
           color = SkColorSetRGB(7, 149, 0);
           break;
 
         case ToolbarModel::SECURITY_WARNING:
-          return GetColor(security_level, DEEMPHASIZED_TEXT);
+          return GetColor(theme, security_level, DEEMPHASIZED_TEXT);
           break;
 
         case ToolbarModel::SECURITY_ERROR:
           color = SkColorSetRGB(162, 0, 0);
           break;
 
         default:
           NOTREACHED();
-          return GetColor(security_level, TEXT);
+          return GetColor(theme, security_level, TEXT);
       }
-      return color_utils::GetReadableColor(color, GetColor(security_level,
+      return color_utils::GetReadableColor(color, GetColor(theme,

[Peter Kasting, 2012/11/08 18:55:47]

Nit: Or

      return color_utils::GetReadableColor(
          color, GetColor(theme, security_level, BACKGROUND));

+                                                           security_level,
                                                            BACKGROUND));
     }
 
     default:
       NOTREACHED();
-      return GetColor(security_level, TEXT);
+      return GetColor(theme, security_level, TEXT);
   }
 }
 
 // static
 int LocationBarView::GetItemPadding() {
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH)
     return kTouchItemPadding;
   return extensions::FeatureSwitch::script_badges()->IsEnabled() ?
       kDesktopScriptBadgeItemPadding : kDesktopItemPadding;
 }
@@ skipping 203 matching lines @@
 }
 
 void LocationBarView::SetInstantSuggestion(const string16& text) {
   // Don't show the suggested text if inline autocomplete is prevented.
   if (!text.empty()) {
     if (!suggested_text_view_) {
       suggested_text_view_ = new views::Label();
       suggested_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       suggested_text_view_->SetAutoColorReadabilityEnabled(false);
       suggested_text_view_->SetEnabledColor(LocationBarView::GetColor(
-          ToolbarModel::NONE, LocationBarView::DEEMPHASIZED_TEXT));
+          GetNativeTheme(), ToolbarModel::NONE,
+          LocationBarView::DEEMPHASIZED_TEXT));
       suggested_text_view_->SetText(text);
       suggested_text_view_->SetFont(location_entry_->GetFont());
       AddChildView(suggested_text_view_);
     } else if (suggested_text_view_->text() != text) {
       suggested_text_view_->SetText(text);
     }
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
     suggested_text_view_ = NULL;
   } else {
@@ skipping 336 matching lines @@
 
   // Draw the background color so that the graphical elements at the edges
   // appear over the correct color.  (The edit draws its own background, so this
   // isn't important for that.)
   // TODO(pkasting): We need images that are transparent in the middle, so we
   // can draw the border images over the background color instead of the
   // reverse; this antialiases better (see comments in
   // OmniboxPopupContentsView::OnPaint()).
   gfx::Rect bounds(GetContentsBounds());
   bounds.Inset(0, kVerticalEdgeThickness);
-  SkColor color(GetColor(ToolbarModel::NONE, BACKGROUND));
+  SkColor color(GetColor(GetNativeTheme(), ToolbarModel::NONE, BACKGROUND));
   if (mode_ == NORMAL) {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
     // TODO(jamescook): Make the corners of the dropdown match the corners of
     // the omnibox.
     bounds.Inset(kNormalHorizontalEdgeThickness, 0);
     // Paint the actual background color.
     paint.setColor(color);
     canvas->DrawRoundRect(bounds, kBorderCornerRadius, paint);
@@ skipping 281 matching lines @@
 }
 
 void LocationBarView::PaintPageActionBackgrounds(gfx::Canvas* canvas) {
   TabContents* tab_contents = GetTabContents();
   // tab_contents may be NULL while the browser is shutting down.
   if (tab_contents == NULL)
     return;
 
   const int32 tab_id = SessionID::IdForTab(tab_contents->web_contents());
   const ToolbarModel::SecurityLevel security_level = model_->GetSecurityLevel();
-  const SkColor text_color = GetColor(security_level, TEXT);
-  const SkColor background_color = GetColor(security_level, BACKGROUND);
+  const ui::NativeTheme* theme = GetNativeTheme();
+  const SkColor text_color = GetColor(theme, security_level, TEXT);
+  const SkColor background_color = GetColor(theme, security_level, BACKGROUND);
 
   for (PageActionViews::const_iterator
            page_action_view = page_action_views_.begin();
        page_action_view != page_action_views_.end();
        ++page_action_view) {
     gfx::Rect bounds = (*page_action_view)->bounds();
     int horizontal_padding = GetItemPadding() -
         (*page_action_view)->GetBuiltInHorizontalPadding();
     // Make the bounding rectangle include the whole vertical range of the
     // location bar, and the mid-point pixels between adjacent page actions.
@@ skipping 301 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA