[MD] Implement incognito colors as a NativeTheme (for Aura).

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/i18n/rtl.h"
@@ skipping 138 matching lines @@
       template_url_service_(NULL),
       dropdown_animation_offset_(0),
       web_contents_null_at_last_refresh_(true) {
   edit_bookmarks_enabled_.Init(
       bookmarks::prefs::kEditBookmarksEnabled, profile->GetPrefs(),
       base::Bind(&LocationBarView::UpdateWithoutTabRestore,
                  base::Unretained(this)));
 
   ui_zoom::ZoomEventManager::GetForBrowserContext(profile)
       ->AddZoomEventManagerObserver(this);
-
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    set_background(new BackgroundWith1PxBorder(
-        GetColor(SecurityStateModel::NONE, BACKGROUND),
-        SkColorSetARGB(0x4D, 0x00, 0x00, 0x00), is_popup_mode_));
-  }
 }
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 
   ui_zoom::ZoomEventManager::GetForBrowserContext(profile())
       ->RemoveZoomEventManagerObserver(this);
 }
 
@@ skipping 40 matching lines @@
   const int kBubbleInteriorVerticalPadding =
       ui::MaterialDesignController::IsModeMaterial() ? 2 : 1;
   const int bubble_padding =
       GetVerticalEdgeThickness() +
       GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING) +
       kBubbleInteriorVerticalPadding;
   const int bubble_height = GetPreferredSize().height() - (bubble_padding * 2);
   gfx::FontList bubble_font_list =
       font_list.DeriveWithHeightUpperBound(bubble_height);
 
-  const SkColor background_color =
-      GetColor(SecurityStateModel::NONE, LocationBarView::BACKGROUND);
-  const SkColor ev_text_color =
-      GetColor(SecurityStateModel::EV_SECURE, SECURITY_TEXT);
+  const SkColor background_color = GetColor(LocationBarView::BACKGROUND);
+  const SkColor ev_text_color = GetColor(EV_BUBBLE_TEXT_AND_BORDER);
   ev_bubble_view_ =
       new EVBubbleView(bubble_font_list, ev_text_color, background_color, this);
   ev_bubble_view_->set_drag_controller(this);
   AddChildView(ev_bubble_view_);
 
   // Initialize the Omnibox view.
   omnibox_view_ = new OmniboxViewViews(
       this, profile(), command_updater(), is_popup_mode_, this, font_list);
   omnibox_view_->Init();
   omnibox_view_->SetFocusable(true);
   AddChildView(omnibox_view_);
 
   // Initialize the inline autocomplete view which is visible only when IME is
   // turned on.  Use the same font with the omnibox and highlighted background.
   ime_inline_autocomplete_view_ = new views::Label(base::string16(), font_list);
   ime_inline_autocomplete_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   ime_inline_autocomplete_view_->SetAutoColorReadabilityEnabled(false);
   ime_inline_autocomplete_view_->set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
   ime_inline_autocomplete_view_->SetEnabledColor(
       GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionColor));
   ime_inline_autocomplete_view_->SetVisible(false);
   AddChildView(ime_inline_autocomplete_view_);
 
-  const SkColor selected_text_color = GetColor(SecurityStateModel::NONE, TEXT);
+  const SkColor selected_text_color = GetColor(TEXT);
   selected_keyword_view_ = new SelectedKeywordView(
       bubble_font_list, selected_text_color, background_color, profile());
   AddChildView(selected_keyword_view_);
 
   suggested_text_view_ = new views::Label(base::string16(), font_list);
   suggested_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   suggested_text_view_->SetAutoColorReadabilityEnabled(false);
   suggested_text_view_->SetEnabledColor(
-      GetColor(SecurityStateModel::NONE, LocationBarView::DEEMPHASIZED_TEXT));
+      GetColor(LocationBarView::DEEMPHASIZED_TEXT));
   suggested_text_view_->SetVisible(false);
   AddChildView(suggested_text_view_);
 
   keyword_hint_view_ = new KeywordHintView(
       profile(), font_list, bubble_font_list,
       bubble_height + 2 * kBubbleInteriorVerticalPadding,
-      GetColor(SecurityStateModel::NONE, LocationBarView::DEEMPHASIZED_TEXT),
-      background_color);
+      GetColor(LocationBarView::DEEMPHASIZED_TEXT), background_color);
   AddChildView(keyword_hint_view_);
 
-  const SkColor text_color = GetColor(SecurityStateModel::NONE, TEXT);
+  const SkColor text_color = GetColor(TEXT);
   ScopedVector<ContentSettingImageModel> models =
       ContentSettingImageModel::GenerateContentSettingImageModels();
   for (ContentSettingImageModel* model : models.get()) {
     // ContentSettingImageView takes ownership of its model.
     ContentSettingImageView* image_view = new ContentSettingImageView(
         model, this, bubble_font_list, text_color, background_color);
     content_setting_views_.push_back(image_view);
     image_view->SetVisible(false);
     AddChildView(image_view);
   }
@@ skipping 26 matching lines @@
   Update(NULL);
 
   size_animation_.Reset(1);
 }
 
 bool LocationBarView::IsInitialized() const {
   return omnibox_view_ != NULL;
 }
 
 SkColor LocationBarView::GetColor(
-    SecurityStateModel::SecurityLevel security_level,
     ColorKind kind) const {
   const ui::NativeTheme* native_theme = GetNativeTheme();
   switch (kind) {
     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);
+      return color_utils::AlphaBlend(GetColor(TEXT), GetColor(BACKGROUND), 128);
 
-    case SECURITY_TEXT: {
-      SkColor color;
-      switch (security_level) {
-        case SecurityStateModel::EV_SECURE:
-        case SecurityStateModel::SECURE:
-          color = ui::MaterialDesignController::IsModeMaterial() ?
-              gfx::kGoogleGreen700 : SkColorSetRGB(7, 149, 0);
-          break;
+    case EV_BUBBLE_TEXT_AND_BORDER:
+      return ui::MaterialDesignController::IsModeMaterial()
+                 ? gfx::kGoogleGreen700
+                 : SkColorSetRGB(7, 149, 0);

[Peter Kasting, 2015/11/14 02:46:08]

I think you need to call GetReadableColor(..., GetColor(BACKGROUND)) on the
overall result here.

[Evan Stade, 2015/11/16 19:36:32]

This color is not used for text on top of the location bar BG, except in the
SECURE text case, so I updated that below.

- in pre-MD, the bubble background is hardcoded to a light green 9-box, so no
need to adjust this color
- in MD, this green is also hard-coded. When the location bar BG is dark, the
bubble appearance changes a bit but the chip will always have a light BG.

+  }
+  NOTREACHED();
+  return gfx::kPlaceholderColor;
+}
 
-        case SecurityStateModel::SECURITY_POLICY_WARNING:
-          return GetColor(security_level, DEEMPHASIZED_TEXT);
-          break;
+SkColor LocationBarView::GetSecureTextColor(
+    SecurityStateModel::SecurityLevel security_level) const {
+  bool inverted =
+      color_utils::GetLuminanceForColor(GetColor(BACKGROUND)) < 128;
+  SkColor color;
+  switch (security_level) {
+    case SecurityStateModel::EV_SECURE:
+    case SecurityStateModel::SECURE:
+      return ui::MaterialDesignController::IsModeMaterial() && inverted
+                 ? GetColor(TEXT)
+                 : GetColor(EV_BUBBLE_TEXT_AND_BORDER);
+      break;
 
-        case SecurityStateModel::SECURITY_ERROR:
-          color = ui::MaterialDesignController::IsModeMaterial() ?
-              gfx::kGoogleRed700 : SkColorSetRGB(162, 0, 0);
-          break;
+    case SecurityStateModel::SECURITY_POLICY_WARNING:
+      return GetColor(DEEMPHASIZED_TEXT);
+      break;
 
-        case SecurityStateModel::SECURITY_WARNING:
-          return GetColor(security_level, TEXT);
-          break;
+    case SecurityStateModel::SECURITY_ERROR:
+      color = ui::MaterialDesignController::IsModeMaterial()
+                  ? inverted ? GetColor(TEXT) : gfx::kGoogleRed700

[Peter Kasting, 2015/11/14 02:46:08]

I like ?:s, but please avoid nesting them...

    case SecurityStateModel::SECURITY_ERROR: {
      const bool md = ui::MaterialDesignController::IsModeMaterial();
      if (md && inverted)
        return GetColor(TEXT);
      return color_utils::GetReadableColor(
          md ? gfx::kGoogleRed700 : SkColorSetRGB(162, 0, 0),
          GetColor(BACKGROUND));
    }

If you write things this way, you can also kill the |color| variable, and nuke
the default state and change the function end to the contents of the current
default state (since then all switch arms will return directly).

[Evan Stade, 2015/11/16 19:36:32]

rewrote this, but there are still two cases which use the color_utils fn

+                  : SkColorSetRGB(162, 0, 0);
+      break;
 
-        default:
-          NOTREACHED();
-          return GetColor(security_level, TEXT);
-      }
-      return color_utils::GetReadableColor(
-          color, GetColor(security_level, BACKGROUND));
-    }
+    case SecurityStateModel::SECURITY_WARNING:
+      return GetColor(TEXT);
+      break;
 
     default:
       NOTREACHED();
-      return GetColor(security_level, TEXT);
+      return gfx::kPlaceholderColor;
   }
+  return color_utils::GetReadableColor(color, GetColor(BACKGROUND));
 }
 
 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
   DCHECK(zoom_view_);
   if (RefreshZoomView()) {
     Layout();
     SchedulePaint();
   }
 
   WebContents* web_contents = GetWebContents();
@@ skipping 397 matching lines @@
     else if (location_needed_width + width > entry_width)
       x = entry_width - width;
     location_bounds.set_width(x);
     ime_inline_autocomplete_view_->SetBounds(
         location_bounds.right(), location_bounds.y(),
         std::min(width, entry_width), location_bounds.height());
   }
   omnibox_view_->SetBoundsRect(location_bounds);
 }
 
+void LocationBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+  if (!ui::MaterialDesignController::IsModeMaterial())
+    return;
+
+  set_background(new BackgroundWith1PxBorder(
+      GetColor(BACKGROUND), SkColorSetARGB(0x4D, 0x00, 0x00, 0x00),
+      is_popup_mode_));
+}
+
 void LocationBarView::Update(const WebContents* contents) {
   RefreshContentSettingViews();
   RefreshZoomView();
   RefreshPageActionViews();
   RefreshTranslateIcon();
   RefreshSaveCreditCardIconView();
   RefreshManagePasswordsIconView();
   content::WebContents* web_contents_for_sub_views =
       GetToolbarModel()->input_in_progress() ? NULL : GetWebContents();
   open_pdf_in_reader_view_->Update(web_contents_for_sub_views);
@@ skipping 449 matching lines @@
   View::OnPaint(canvas);
 
   if (ui::MaterialDesignController::IsModeMaterial())
     return;  // The background and border are painted by our Background.
 
   // Fill the location bar background color behind the border.  Parts of the
   // border images are meant to rest atop the toolbar background and parts atop
   // the omnibox background, so we can't just blindly fill our entire bounds.
   gfx::Rect bounds(GetContentsBounds());
   bounds.Inset(GetHorizontalEdgeThickness(), GetVerticalEdgeThickness());
-  SkColor color(GetColor(SecurityStateModel::NONE, BACKGROUND));
+  SkColor color(GetColor(BACKGROUND));
   if (is_popup_mode_) {
     canvas->FillRect(bounds, color);
   } else {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(color);
     const int kBorderCornerRadius = 2;
     canvas->DrawRoundRect(bounds, kBorderCornerRadius, paint);
   }
 
@@ skipping 111 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = NULL;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }