Use native theme colors for textfields; etc.

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 100 matching lines @@
 const int kBorderCornerRadius = 2;
 
 const int kDesktopItemPadding = 3;
 const int kDesktopEdgeItemPadding = kDesktopItemPadding;
 const int kDesktopScriptBadgeItemPadding = 9;
 const int kDesktopScriptBadgeEdgeItemPadding = kDesktopScriptBadgeItemPadding;
 
 const int kTouchItemPadding = 8;
 const int kTouchEdgeItemPadding = kTouchItemPadding;
 
-#if defined(OS_CHROMEOS)

[msw, 2012/12/04 18:40:07]

Varun: Is this still needed? It's purpose isn't explained in crrev.com/152436

[varunjain, 2012/12/04 23:05:31]

This was done because we want the omnibox to have the background color of the
asset used to draw the omnibox (browser_omnibox_border.png). This is only really
used for chromeos as for win, the color is obtained from the GetSysColor call.
Now that you are using native theme (awesome!), this is not needed, but you will
have to change the default color in native_theme_aura to this value to avoid
causing any regressions.

[msw, 2012/12/05 02:09:56]

I in-lined the CrOS case into GetColor, as explained above.

-const SkColor kOmniboxBackgroundColor = SkColorSetARGB(0, 255, 255, 255);
-#else
-const SkColor kOmniboxBackgroundColor = SkColorSetARGB(255, 255, 255, 255);
-#endif
-
 }  // namespace
 
 // static
 const int LocationBarView::kNormalHorizontalEdgeThickness = 2;
 const int LocationBarView::kVerticalEdgeThickness = 3;
 const int LocationBarView::kIconInternalPadding = 2;
 const int LocationBarView::kBubbleHorizontalPadding = 1;
 const char LocationBarView::kViewClassName[] =
     "browser/ui/views/location_bar/LocationBarView";
 
@@ skipping 181 matching lines @@
 
   OnChanged();
 }
 
 bool LocationBarView::IsInitialized() const {
   return location_entry_view_ != NULL;
 }
 
 SkColor LocationBarView::GetColor(ToolbarModel::SecurityLevel security_level,
                                   ColorKind kind) const {
-#if defined(OS_WIN)
-  if (GetNativeTheme() == 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
+  const ui::NativeTheme* native_theme = GetNativeTheme();
   switch (kind) {
-    // TODO(beng): source from theme provider.
-    case BACKGROUND:    return kOmniboxBackgroundColor;
-    case TEXT:          return SK_ColorBLACK;
-    case SELECTED_TEXT: return SK_ColorWHITE;
+    case BACKGROUND:
+      return native_theme->GetSystemColor(
+          ui::NativeTheme::kColorId_TextfieldDefaultBackground);
+
+    case TEXT:
+      return native_theme->GetSystemColor(
+          ui::NativeTheme::kColorId_TextfieldDefaultColor);
+
+    case SELECTED_TEXT:
+      return native_theme->GetSystemColor(
+          ui::NativeTheme::kColorId_TextfieldSelectionColor);
 
     case DEEMPHASIZED_TEXT:
       return color_utils::AlphaBlend(
           GetColor(security_level, TEXT),
           GetColor(security_level, BACKGROUND),
           128);
 
     case SECURITY_TEXT: {
       SkColor color;
       switch (security_level) {
@@ skipping 1160 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }