[omnibox] Keyword mode experiment: Try more visible button

This CL describes an experiment to see if a dark blue keyword mode
button will make it more visible and attention-getting.

Bug: 883901
Change-Id: Ibef0b56b1a36f6debae0a446123632e173448c48
Reviewed-on: https://chromium-review.googlesource.com/1234035
Commit-Queue: Kevin Bailey <krb@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594488}

chrome/browser/ui/omnibox/omnibox_theme.cc

@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
+#include "components/omnibox/browser/omnibox_field_trial.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
@@ -279,6 +280,8 @@ SkColor GetOmniboxColor(OmniboxPart part,
       return dark ? gfx::kGoogleBlueDark600 : gfx::kGoogleBlue600;
 
     case OmniboxPart::LOCATION_BAR_BUBBLE_OUTLINE:
+      if (OmniboxFieldTrial::IsExperimentalKeywordModeEnabled())
+        return gfx::kGoogleBlue700;
       return dark ? gfx::kGoogleGrey100
                   : SkColorSetA(gfx::kGoogleGrey900, 0x24);
 

chrome/browser/ui/views/location_bar/keyword_hint_view.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search_engines/template_url_service.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -39,6 +40,8 @@ KeywordHintView::KeywordHintView(views::ButtonListener* listener,
       chip_label_(
           new views::Label(base::string16(), CONTEXT_OMNIBOX_DECORATION)),
       trailing_label_(nullptr) {
+  const bool experimental_keyword_mode =
+      OmniboxFieldTrial::IsExperimentalKeywordModeEnabled();
   const bool is_newer_material =
       ui::MaterialDesignController::IsNewerMaterialUi();
   SkColor text_color =
@@ -57,24 +60,30 @@ KeywordHintView::KeywordHintView(views::ButtonListener* listener,
                                      : kPaddingInsideBorder + 1;
   chip_label_->SetBorder(
       views::CreateEmptyBorder(gfx::Insets(0, horizontal_padding)));
-  chip_label_->SetEnabledColor(text_color);
 
-  bool inverted = color_utils::IsDark(background_color);
-  SkColor tab_bg_color =
-      inverted ? SK_ColorWHITE : SkColorSetA(text_color, 0x13);
-  SkColor tab_border_color = inverted ? SK_ColorWHITE : text_color;
+  SkColor tab_bg_color = SkColorSetA(text_color, 0x13);
+  SkColor tab_border_color = text_color;
+  if (color_utils::IsDark(background_color)) {
+    tab_bg_color = SK_ColorWHITE;
+    tab_border_color = SK_ColorWHITE;
+  }
   if (is_newer_material) {
-    tab_bg_color = background_color;
     tab_border_color =
         GetOmniboxColor(OmniboxPart::LOCATION_BAR_BUBBLE_OUTLINE, tint);
+    if (!experimental_keyword_mode) {
+      tab_bg_color = GetOmniboxColor(OmniboxPart::RESULTS_BACKGROUND, tint);
+    } else {
+      tab_bg_color = tab_border_color;
+      text_color = SK_ColorWHITE;
+    }
   }
+  chip_label_->SetEnabledColor(text_color);
   chip_label_->SetBackgroundColor(tab_bg_color);
 
-  chip_container_->SetBackground(views::CreateSolidBackground(tab_bg_color));
-  chip_container_->SetBorder(views::CreateRoundedRectBorder(
-      1, GetLayoutConstant(LOCATION_BAR_BUBBLE_CORNER_RADIUS),
-      tab_border_color));
-
+  chip_container_->SetBackground(CreateBackgroundFromPainter(
+      views::Painter::CreateRoundRectWith1PxBorderPainter(
+          tab_bg_color, tab_border_color,
+          GetLayoutConstant(LOCATION_BAR_BUBBLE_CORNER_RADIUS))));
   chip_container_->AddChildView(chip_label_);
   chip_container_->SetLayoutManager(std::make_unique<views::FillLayout>());
   AddChildView(chip_container_);
@@ -91,13 +100,7 @@ KeywordHintView::KeywordHintView(views::ButtonListener* listener,
 
 KeywordHintView::~KeywordHintView() {}
 
-void KeywordHintView::SetKeyword(const base::string16& keyword,
-                                 SkColor background_color) {
-  if (ui::MaterialDesignController::IsNewerMaterialUi()) {
-    chip_label_->SetBackgroundColor(background_color);
-    chip_container_->background()->SetNativeControlColor(background_color);
-  }
-
+void KeywordHintView::SetKeyword(const base::string16& keyword) {
   // When the virtual keyboard is visible, we show a modified touch UI
   // containing only the chip and no surrounding labels.
   const bool was_touch_ui = leading_label_->text().empty();

chrome/browser/ui/views/location_bar/keyword_hint_view.h

@@ -35,7 +35,7 @@ class KeywordHintView : public views::Button {
                   OmniboxTint tint);
   ~KeywordHintView() override;
 
-  void SetKeyword(const base::string16& keyword, SkColor background_color);
+  void SetKeyword(const base::string16& keyword);
 
   // views::View:
   gfx::Insets GetInsets() const override;

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -590,8 +590,7 @@ void LocationBarView::Layout() {
     trailing_decorations.AddDecoration(vertical_padding, location_height, true,
                                        0, edge_padding, internal_padding,
                                        keyword_hint_view_);
-    keyword_hint_view_->SetKeyword(
-        keyword, GetOmniboxColor(OmniboxPart::RESULTS_BACKGROUND, tint()));
+    keyword_hint_view_->SetKeyword(keyword);
   }
 
   add_trailing_decoration(clear_all_button_);

components/omnibox/browser/omnibox_field_trial.cc

@@ -811,6 +811,10 @@ int OmniboxFieldTrial::GetSuggestionVerticalMargin() {
       omnibox::kUIExperimentVerticalMargin, kUIVerticalMarginParam, 10);
 }
 
+bool OmniboxFieldTrial::IsExperimentalKeywordModeEnabled() {
+  return base::FeatureList::IsEnabled(omnibox::kExperimentalKeywordMode);
+}
+
 const char OmniboxFieldTrial::kBundledExperimentFieldTrialName[] =
     "OmniboxBundledExperimentV1";
 const char OmniboxFieldTrial::kDisableProvidersRule[] = "DisableProviders";

components/omnibox/browser/omnibox_field_trial.h

@@ -454,6 +454,9 @@ class OmniboxFieldTrial {
   // suggestion view.
   static int GetSuggestionVerticalMargin();
 
+  // Returns true if the experimental keyword mode is enabled.
+  static bool IsExperimentalKeywordModeEnabled();
+
   // ---------------------------------------------------------
   // Clipboard URL suggestions: