Merge 25494 - Use system themes where possible in Omnibox edit and dropdown; ...

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2009 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/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
 #include "build/build_config.h"
 
 #include "app/gfx/canvas.h"
+#include "app/gfx/color_utils.h"
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 15 matching lines @@
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "chrome/browser/views/first_run_bubble.h"
-#else
-#include "base/gfx/gtk_util.h"
-#include "chrome/browser/gtk/location_bar_view_gtk.h"
 #endif
 
 using views::View;
 
+// static
 const int LocationBarView::kVertMargin = 2;
 
-const SkColor LocationBarView::kBackgroundColorByLevel[] = {
-  SkColorSetRGB(255, 245, 195),  // SecurityLevel SECURE: Yellow.
-  SkColorSetRGB(255, 255, 255),  // SecurityLevel NORMAL: White.
-  SkColorSetRGB(255, 255, 255),  // SecurityLevel INSECURE: White.
-};
-#if defined(OS_LINUX)
-// static
-const GdkColor LocationBarViewGtk::kBackgroundColorByLevel[3] = {
-  GDK_COLOR_RGB(255, 245, 195),  // SecurityLevel SECURE: Yellow.
-  GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel NORMAL: White.
-  GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel INSECURE: White.
-};
-#endif
-
 // Padding on the right and left of the entry field.
 static const int kEntryPadding = 3;
 
 // Padding between the entry and the leading/trailing views.
 static const int kInnerPadding = 3;
 
 static const SkBitmap* kBackground = NULL;
 
 static const SkBitmap* kPopupBackground = NULL;
 
@@ skipping 44 matching lines @@
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     kBackground = rb.GetBitmapNamed(IDR_LOCATIONBG);
     kPopupBackground = rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_CENTER);
   }
 }
 
 LocationBarView::~LocationBarView() {
   DeletePageActionViews();
 }
 
-bool LocationBarView::IsInitialized() const {
-  return location_entry_view_ != NULL;
-}
-
 void LocationBarView::Init() {
   if (popup_window_mode_) {
     font_ = ResourceBundle::GetSharedInstance().GetFont(
         ResourceBundle::BaseFont);
   } else {
     // Use a larger version of the system font.
     font_ = font_.DeriveFont(3);
   }
 
   // URL edit field.
@@ skipping 27 matching lines @@
 #else
                                location_entry_->widget()
 #endif
                                );
 
   AddChildView(&selected_keyword_view_);
   selected_keyword_view_.SetFont(font_);
   selected_keyword_view_.SetVisible(false);
   selected_keyword_view_.SetParentOwned(false);
 
-#if defined(OS_WIN)
-  DWORD sys_color = GetSysColor(COLOR_GRAYTEXT);
-  SkColor gray = SkColorSetRGB(GetRValue(sys_color), GetGValue(sys_color),
-                               GetBValue(sys_color));
-#else
-  NOTIMPLEMENTED();
-  SkColor gray = SK_ColorGRAY;
-#endif
+  SkColor dimmed_text = GetColor(false, DEEMPHASIZED_TEXT);
 
   AddChildView(&type_to_search_view_);
   type_to_search_view_.SetVisible(false);
   type_to_search_view_.SetFont(font_);
-  type_to_search_view_.SetColor(gray);
+  type_to_search_view_.SetColor(dimmed_text);
   type_to_search_view_.SetParentOwned(false);
 
   AddChildView(&keyword_hint_view_);
   keyword_hint_view_.SetVisible(false);
   keyword_hint_view_.SetFont(font_);
-  keyword_hint_view_.SetColor(gray);
+  keyword_hint_view_.SetColor(dimmed_text);
   keyword_hint_view_.SetParentOwned(false);
 
   AddChildView(&security_image_view_);
   security_image_view_.SetVisible(false);
   security_image_view_.SetParentOwned(false);
 
   AddChildView(&info_label_);
   info_label_.SetVisible(false);
   info_label_.SetParentOwned(false);
 
   // Notify us when any ancestor is resized.  In this case we want to tell the
   // AutocompleteEditView to close its popup.
   SetNotifyWhenVisibleBoundsInRootChanges(true);
 
   // Initialize the location entry. We do this to avoid a black flash which is
   // visible when the location entry has just been initialized.
   Update(NULL);
 
   OnChanged();
 }
 
+bool LocationBarView::IsInitialized() const {
+  return location_entry_view_ != NULL;
+}
+
+// static
+SkColor LocationBarView::GetColor(bool is_secure, ColorKind kind) {
+  enum SecurityState {
+    NOT_SECURE = 0,
+    SECURE,
+    NUM_STATES
+  };
+
+  static bool initialized = false;
+  static SkColor colors[NUM_STATES][NUM_KINDS];
+  if (!initialized) {
+#if defined(OS_WIN)
+    colors[NOT_SECURE][BACKGROUND] = color_utils::GetSysSkColor(COLOR_WINDOW);
+    colors[NOT_SECURE][TEXT] = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
+    colors[NOT_SECURE][SELECTED_TEXT] =
+        color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
+#else
+    // TODO(beng): source from theme provider.
+    colors[NOT_SECURE][BACKGROUND] = SK_ColorWHITE;
+    colors[NOT_SECURE][TEXT] = SK_ColorBLACK;
+    colors[NOT_SECURE][SELECTED_TEXT] = SK_ColorWHITE;
+#endif
+    colors[SECURE][BACKGROUND] = SkColorSetRGB(255, 245, 195);
+    colors[SECURE][TEXT] = SkColorSetRGB(0, 0, 0);
+    colors[SECURE][SELECTED_TEXT] = 0;  // Unused
+    colors[NOT_SECURE][DEEMPHASIZED_TEXT] =
+        color_utils::AlphaBlend(colors[NOT_SECURE][TEXT],
+                                colors[NOT_SECURE][BACKGROUND], 128);
+    colors[SECURE][DEEMPHASIZED_TEXT] =
+        color_utils::AlphaBlend(colors[SECURE][TEXT],
+                                colors[SECURE][BACKGROUND], 128);
+    const SkColor kDarkNotSecureText = SkColorSetRGB(200, 0, 0);
+    const SkColor kLightNotSecureText = SkColorSetRGB(255, 55, 55);
+    colors[NOT_SECURE][SECURITY_TEXT] =
+        color_utils::PickMoreReadableColor(kDarkNotSecureText,
+                                           kLightNotSecureText,
+                                           colors[NOT_SECURE][BACKGROUND]);
+    colors[SECURE][SECURITY_TEXT] = SkColorSetRGB(0, 150, 20);
+#if 0  // Info bubble background color is system theme window background color
+    colors[NOT_SECURE][SECURITY_INFO_BUBBLE_TEXT] =
+        colors[NOT_SECURE][SECURITY_TEXT];
+    const SkColor kDarkSecureInfoBubbleText = SkColorSetRGB(0, 153, 51);
+    const SkColor kLightSecureInfoBubbleText = SkColorSetRGB(102, 255, 152);
+    colors[SECURE][SECURITY_INFO_BUBBLE_TEXT] =
+        color_utils::PickMoreReadableColor(kDarkSecureInfoBubbleText,
+                                           kLightSecureInfoBubbleText,
+                                           colors[NOT_SECURE][BACKGROUND]);
+#else  // Info bubble background color is white
+    colors[NOT_SECURE][SECURITY_INFO_BUBBLE_TEXT] = kDarkNotSecureText;
+    colors[SECURE][SECURITY_INFO_BUBBLE_TEXT] = SkColorSetRGB(0, 153, 51);
+#endif
+    const SkColor kDarkSchemeStrikeout = SkColorSetRGB(210, 0, 0);
+    const SkColor kLightSchemeStrikeout = SkColorSetRGB(255, 45, 45);
+    colors[NOT_SECURE][SCHEME_STRIKEOUT] =
+        color_utils::PickMoreReadableColor(kDarkSchemeStrikeout,
+                                           kLightSchemeStrikeout,
+                                           colors[NOT_SECURE][BACKGROUND]);
+    colors[SECURE][SCHEME_STRIKEOUT] = 0;  // Unused
+    initialized = true;
+  }
+
+  return colors[is_secure ? SECURE : NOT_SECURE][kind];
+}
+
 void LocationBarView::Update(const TabContents* tab_for_state_restoring) {
   SetSecurityIcon(model_->GetIcon());
   RefreshPageActionViews();
   std::wstring info_text, info_tooltip;
   ToolbarModel::InfoTextType info_text_type =
       model_->GetInfoText(&info_text, &info_tooltip);
   SetInfoText(info_text, info_text_type, info_tooltip);
   location_entry_->Update(tab_for_state_restoring);
   Layout();
   SchedulePaint();
@@ skipping 30 matching lines @@
       (popup_window_mode_ ? kPopupBackground : kBackground)->height());
 }
 
 void LocationBarView::Layout() {
   DoLayout(true);
 }
 
 void LocationBarView::Paint(gfx::Canvas* canvas) {
   View::Paint(canvas);
 
-  SkColor bg = kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()];
-
   const SkBitmap* background =
       popup_window_mode_ ?
           kPopupBackground :
           GetThemeProvider()->GetBitmapNamed(IDR_LOCATIONBG);
 
   canvas->TileImageInt(*background, 0, 0, 0, 0, width(), height());
   int top_margin = TopMargin();
-  canvas->FillRectInt(bg, 0, top_margin, width(),
-                      std::max(height() - top_margin - kVertMargin, 0));
+  canvas->FillRectInt(
+      GetColor(model_->GetSchemeSecurityLevel() == ToolbarModel::SECURE,
+               BACKGROUND),
+      0, top_margin, width(), std::max(height() - top_margin - kVertMargin, 0));
 }
 
 void LocationBarView::VisibleBoundsInRootChanged() {
   location_entry_->ClosePopup();
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::OnMousePressed(const views::MouseEvent& event) {
   UINT msg;
   if (event.IsLeftMouseButton()) {
@@ skipping 353 matching lines @@
       page_action_image_views_[i]->UpdateVisibility(contents, url);
   }
 }
 
 void LocationBarView::SetInfoText(const std::wstring& text,
                                   ToolbarModel::InfoTextType text_type,
                                   const std::wstring& tooltip_text) {
   info_label_.SetVisible(!text.empty());
   info_label_.SetText(text);
   if (text_type == ToolbarModel::INFO_EV_TEXT)
-    info_label_.SetColor(SkColorSetRGB(0, 150, 20));  // Green.
+    info_label_.SetColor(GetColor(true, SECURITY_TEXT));
   info_label_.SetTooltipText(tooltip_text);
 }
 
 bool LocationBarView::ToggleVisibility(bool new_vis, View* view) {
   DCHECK(view);
   if (view->IsVisible() != new_vis) {
     view->SetVisible(new_vis);
     return true;
   }
   return false;
@@ skipping 446 matching lines @@
   if (!nav_entry) {
     NOTREACHED();
     return true;
   }
   tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true);
   return true;
 }
 
 void LocationBarView::SecurityImageView::ShowInfoBubble() {
   std::wstring text;
-  SkColor text_color;
-  model_->GetIconHoverText(&text, &text_color);
-
-  ShowInfoBubbleImpl(text, text_color);
+  model_->GetIconHoverText(&text);
+  ShowInfoBubbleImpl(text, GetColor(
+      model_->GetSecurityLevel() == ToolbarModel::SECURE,
+      SECURITY_INFO_BUBBLE_TEXT));
 }
 
 // PageActionImageView----------------------------------------------------------
 
 // The views need to load their icons asynchronously but might be deleted before
 // the images have loaded. This class stays alive while the request is in
 // progress (manages its own lifetime) and keeps track of whether the view still
 // cares about the icon loading.
 class LocationBarView::PageActionImageView::ImageLoadingTracker
   : public base::RefCountedThreadSafe<ImageLoadingTracker> {
@@ skipping 142 matching lines @@
 bool LocationBarView::PageActionImageView::OnMousePressed(
     const views::MouseEvent& event) {
   // Our PageAction icon was clicked on, notify proper authorities.
   ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
       profile_, page_action_->extension_id(), page_action_->id(),
       current_tab_id_, current_url_.spec());
   return true;
 }
 
 void LocationBarView::PageActionImageView::ShowInfoBubble() {
-  SkColor text_color = SK_ColorBLACK;
-  ShowInfoBubbleImpl(ASCIIToWide(tooltip_), text_color);
+#if 0  // Info bubble background color is system theme window background color
+  ShowInfoBubbleImpl(ASCIIToWide(tooltip_), GetColor(false, TEXT));
+#else  // Info bubble background color is white
+  ShowInfoBubbleImpl(ASCIIToWide(tooltip_), SK_ColorBLACK);
+#endif
 }
 
 void LocationBarView::PageActionImageView::UpdateVisibility(
     TabContents* contents, GURL url) {
   // Save this off so we can pass it back to the extension when the action gets
   // executed. See PageActionImageView::OnMousePressed.
   current_tab_id_ = ExtensionTabUtil::GetTabId(contents);
   current_url_ = url;
 
   const PageActionState* state = contents->GetPageActionState(page_action_);
@@ skipping 72 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_image_views_.size(); i++) {
     if (page_action_image_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }