Update omnibox chips in MD

chrome/browser/ui/views/location_bar/selected_keyword_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/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 38 matching lines @@
                                    GetTextColor()));
   } else {
     SetImage(*GetThemeProvider()->GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
   }
 }
 
 SkColor SelectedKeywordView::GetTextColor() const {
   if (!ui::MaterialDesignController::IsModeMaterial())
     return text_color_;
 
-  return color_utils::IsDark(GetParentBackgroundColor())
-             ? gfx::kGoogleBlue700
-             : GetNativeTheme()->GetSystemColor(
-                   ui::NativeTheme::kColorId_LinkEnabled);
+  return GetNativeTheme()->GetSystemColor(
+      color_utils::IsDark(GetParentBackgroundColor())
+          ? ui::NativeTheme::kColorId_TextfieldDefaultColor

[Peter Kasting, 2016/05/25 00:03:27]

Was this the final outcome of your discussions with Max?  Seems like it might be
nice to have some kind of blue in this color -- did you guys consider using
GetReadableColor()?

[Evan Stade, 2016/05/25 20:03:44]

yes.  I've pinged Max again to confirm.
How do you feel about the lack of green in the incognito ev chip? I don't think
we'd need to rely on GetReadableColor, we could just hand pick a good shade of
blue. But I kind of like the white because it has the best contrast.

[Peter Kasting, 2016/05/25 20:23:02]

The security guys may feel more strongly than I do.  I think we could use white
if the other options are bad, but it would be nice to have green for this if
it's feasible.

The nice thing about GetReadableColor() is that it ought to transparently handle
it if we make the omnibox responsive to the system color scheme, but I'd be OK
with hardcoding things too.

[Evan Stade, 2016/05/25 21:03:26]

Right, and the bad thing about GetReadableColor is that it isn't
GetGoodLookingAndReadableColor :)

+          : ui::NativeTheme::kColorId_LinkEnabled);
 }
 
 SkColor SelectedKeywordView::GetBorderColor() const {
   DCHECK(ui::MaterialDesignController::IsModeMaterial());
   return GetTextColor();
 }
 
 gfx::Size SelectedKeywordView::GetPreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(full_label_.GetPreferredSize().width());
@@ skipping 16 matching lines @@
     return;
   DCHECK(profile_);
   TemplateURLService* model =
       TemplateURLServiceFactory::GetForProfile(profile_);
   if (!model)
     return;
 
   bool is_extension_keyword;
   const base::string16 short_name =
       model->GetKeywordShortName(keyword, &is_extension_keyword);
-  const base::string16 full_name = is_extension_keyword ?
-      short_name :
-      l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, short_name);
+  int keyword_text_id = ui::MaterialDesignController::IsModeMaterial()
+                            ? IDS_OMNIBOX_KEYWORD_TEXT_MD
+                            : IDS_OMNIBOX_KEYWORD_TEXT;
+  const base::string16 full_name =
+      is_extension_keyword ? short_name : l10n_util::GetStringFUTF16(
+                                              keyword_text_id, short_name);
   full_label_.SetText(full_name);
 
   const base::string16 min_string(
       location_bar_util::CalculateMinString(short_name));
-  const base::string16 partial_name = is_extension_keyword ?
-      min_string :
-      l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
+  const base::string16 partial_name =
+      is_extension_keyword ? min_string : l10n_util::GetStringFUTF16(
+                                              keyword_text_id, min_string);
   partial_label_.SetText(min_string.empty() ?
       full_label_.text() : partial_name);
 }
 
 const char* SelectedKeywordView::GetClassName() const {
   return "SelectedKeywordView";
 }