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

chrome/browser/autocomplete/autocomplete_edit_view_win.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/autocomplete/autocomplete_edit_view_win.h"
 
 #include <locale>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 294 matching lines @@
 
 AutocompleteEditViewWin::ScopedSuspendUndo::~ScopedSuspendUndo() {
   // Resume Undo processing.
   if (text_object_model_)
     text_object_model_->Undo(tomResume, NULL);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditViewWin
 
-// TODO (jcampan): these colors should be derived from the system colors to
-// ensure they show properly. Bug #948807.
-// Colors used to emphasize the scheme in the URL.
-
 namespace {
 
-const COLORREF kSecureSchemeColor = RGB(0, 150, 20);
-const COLORREF kInsecureSchemeColor = RGB(200, 0, 0);
-
-// Colors used to strike-out the scheme when it is insecure.
-const SkColor kSchemeStrikeoutColor = SkColorSetRGB(210, 0, 0);
-const SkColor kSchemeSelectedStrikeoutColor =
-    SkColorSetRGB(255, 255, 255);
-
 // These are used to hook the CRichEditCtrl's calls to BeginPaint() and
 // EndPaint() and provide a memory DC instead.  See OnPaint().
 HWND edit_hwnd = NULL;
 PAINTSTRUCT paint_struct;
 
 // Intercepted method for BeginPaint(). Must use __stdcall convention.
 HDC WINAPI BeginPaintIntercept(HWND hWnd, LPPAINTSTRUCT lpPaint) {
   if (!edit_hwnd || (hWnd != edit_hwnd))
     return ::BeginPaint(hWnd, lpPaint);
 
@@ skipping 118 matching lines @@
   // rendered text.
   const int kTextBaseline = popup_window_mode_ ? 15 : 18;
   font_y_adjustment_ = kTextBaseline - font_ascent_;
   font_descent_ = tm.tmDescent;
 
   // Get the number of twips per pixel, which we need below to offset our text
   // by the desired number of pixels.
   const long kTwipsPerPixel = kTwipsPerInch / GetDeviceCaps(dc, LOGPIXELSY);
   ::ReleaseDC(NULL, dc);
 
-  // Set the default character style -- adjust to our desired baseline and make
-  // text grey.
+  // Set the default character style -- adjust to our desired baseline.
   CHARFORMAT cf = {0};
-  cf.dwMask = CFM_OFFSET | CFM_COLOR;
+  cf.dwMask = CFM_OFFSET;
   cf.yOffset = -font_y_adjustment_ * kTwipsPerPixel;
-  cf.crTextColor = GetSysColor(COLOR_GRAYTEXT);
   SetDefaultCharFormat(cf);
 
   // By default RichEdit has a drop target. Revoke it so that we can install our
   // own. Revoke takes care of deleting the existing one.
   RevokeDragDrop(m_hWnd);
 
   // Register our drop target. RichEdit appears to invoke RevokeDropTarget when
   // done so that we don't have to explicitly.
   if (!popup_window_mode_) {
     scoped_refptr<EditDropTarget> drop_target = new EditDropTarget(this);
@@ skipping 27 matching lines @@
           State(selection, saved_selection_for_focus_change_)));
 }
 
 void AutocompleteEditViewWin::Update(
     const TabContents* tab_for_state_restoring) {
   const bool visibly_changed_permanent_text =
       model_->UpdatePermanentText(toolbar_model_->GetText());
 
   const ToolbarModel::SecurityLevel security_level =
       toolbar_model_->GetSchemeSecurityLevel();
-  const COLORREF background_color = skia::SkColorToCOLORREF(
-      LocationBarView::kBackgroundColorByLevel[security_level]);
+  const COLORREF background_color =
+      skia::SkColorToCOLORREF(LocationBarView::GetColor(
+          security_level == ToolbarModel::SECURE, LocationBarView::BACKGROUND));
   const bool changed_security_level =
       (security_level != scheme_security_level_);
 
   // Bail early when no visible state will actually change (prevents an
   // unnecessary ScopedFreeze, and thus UpdateWindow()).
   if ((background_color == background_color_) && !changed_security_level &&
       !visibly_changed_permanent_text && !tab_for_state_restoring)
     return;
 
   // Update our local state as desired.  We set scheme_security_level_ here so
@@ skipping 1472 matching lines @@
   // And Go system uses.
   url_parse::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(
       GetText(), model_->GetDesiredTLD(), &scheme, &host);
   const bool emphasize = model_->CurrentTextIsURL() && (host.len > 0);
 
   // Set the baseline emphasis.
   CHARFORMAT cf = {0};
   cf.dwMask = CFM_COLOR;
   cf.dwEffects = 0;
-  cf.crTextColor = GetSysColor(emphasize ? COLOR_GRAYTEXT : COLOR_WINDOWTEXT);
+  const bool is_secure = (scheme_security_level_ == ToolbarModel::SECURE);
+  // If we're going to emphasize parts of the text, then the baseline state
+  // should be "de-emphasized".  If not, then everything should be rendered in
+  // the standard text color.
+  cf.crTextColor = skia::SkColorToCOLORREF(LocationBarView::GetColor(is_secure,
+      emphasize ? LocationBarView::DEEMPHASIZED_TEXT : LocationBarView::TEXT));
   SelectAll(false);
   SetSelectionCharFormat(cf);
 
   if (emphasize) {
     // We've found a host name, give it more emphasis.
-    cf.crTextColor = GetSysColor(COLOR_WINDOWTEXT);
+    cf.crTextColor = skia::SkColorToCOLORREF(LocationBarView::GetColor(
+        is_secure, LocationBarView::TEXT));
     SetSelection(host.begin, host.end());
     SetSelectionCharFormat(cf);
   }
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   insecure_scheme_component_.reset();
   if (!model_->user_input_in_progress() && scheme.is_nonempty() &&
       (scheme_security_level_ != ToolbarModel::NORMAL)) {
-    if (scheme_security_level_ == ToolbarModel::SECURE) {
-      cf.crTextColor = kSecureSchemeColor;
-    } else {
+    if (!is_secure) {
       insecure_scheme_component_.begin = scheme.begin;
       insecure_scheme_component_.len = scheme.len;
-      cf.crTextColor = kInsecureSchemeColor;
     }
+    cf.crTextColor = skia::SkColorToCOLORREF(LocationBarView::GetColor(
+        is_secure, LocationBarView::SECURITY_TEXT));
     SetSelection(scheme.begin, scheme.end());
     SetSelectionCharFormat(cf);
   }
 
   // Restore the selection.
   SetSelectionRange(saved_sel);
 }
 
 void AutocompleteEditViewWin::EraseTopOfSelection(
     CDC* dc, const CRect& client_rect, const CRect& paint_clip_rect) {
@@ skipping 76 matching lines @@
   const SkRect selection_rect = {
       SkIntToScalar(PosFromChar(sel.cpMin).x - scheme_rect.left),
       SkIntToScalar(0),
       SkIntToScalar(PosFromChar(sel.cpMax).x - scheme_rect.left),
       SkIntToScalar(scheme_rect.Height()) };
 
   // Draw the unselected portion of the stroke.
   canvas.save();
   if (selection_rect.isEmpty() ||
       canvas.clipRect(selection_rect, SkRegion::kDifference_Op)) {
-    paint.setColor(kSchemeStrikeoutColor);
+    paint.setColor(LocationBarView::GetColor(false,
+        LocationBarView::SCHEME_STRIKEOUT));
     canvas.drawLine(start_point.fX, start_point.fY,
                     end_point.fX, end_point.fY, paint);
   }
   canvas.restore();
 
   // Draw the selected portion of the stroke.
   if (!selection_rect.isEmpty() && canvas.clipRect(selection_rect)) {
-    paint.setColor(kSchemeSelectedStrikeoutColor);
+    paint.setColor(LocationBarView::GetColor(false,
+                                             LocationBarView::SELECTED_TEXT));
     canvas.drawLine(start_point.fX, start_point.fY,
                     end_point.fX, end_point.fY, paint);
   }
 
   // Now copy what we drew to the target HDC.
   canvas.getTopPlatformDevice().drawToHDC(hdc,
       scheme_rect.left + canvas_paint_clip_rect.left - canvas_clip_rect.left,
       std::max(scheme_rect.top, client_rect.top) + canvas_paint_clip_rect.top -
           canvas_clip_rect.top, &canvas_paint_clip_rect);
 }
@@ skipping 218 matching lines @@
     context_menu_contents_->AddItemWithStringId(IDS_PASTE_AND_GO,
                                                 IDS_PASTE_AND_GO);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL, IDS_SELECT_ALL);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
   }
   context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
 }