Reland: Rename omnibox_theme's OmniboxState -> OmniboxPartState

This avoid a conflict with class OmniboxState in an anonymous enum of
omnibox_view_views

Reland: Collided with another CL in flight
Reviewed in: https://crrev.com/c/954527

Bug: 801583
Change-Id: Id13084c7076f4934d34cad36fb932fac71c80c77
Reviewed-on: https://chromium-review.googlesource.com/956642
Commit-Queue: Trent Apted <tapted@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542009}

chrome/browser/ui/omnibox/omnibox_theme.cc

@@ -24,7 +24,7 @@ constexpr ui::NativeTheme::ColorId kInvalidColorId =
     ui::NativeTheme::kColorId_NumColors;
 
 template <class T>
-constexpr T NormalHoveredSelectedOrBoth(OmniboxState state,
+constexpr T NormalHoveredSelectedOrBoth(OmniboxPartState state,
                                         T normal,
                                         T hovered,
                                         T selected,
@@ -34,7 +34,7 @@ constexpr T NormalHoveredSelectedOrBoth(OmniboxState state,
 }
 
 template <class T>
-constexpr T NormalHoveredSelected(OmniboxState state,
+constexpr T NormalHoveredSelected(OmniboxPartState state,
                                   T normal,
                                   T hovered,
                                   T selected) {
@@ -44,7 +44,7 @@ constexpr T NormalHoveredSelected(OmniboxState state,
 }
 
 ui::NativeTheme::ColorId GetLegacyColorId(OmniboxPart part,
-                                          OmniboxState state) {
+                                          OmniboxPartState state) {
   using NativeId = ui::NativeTheme::ColorId;
   switch (part) {
     case OmniboxPart::RESULTS_BACKGROUND:
@@ -56,7 +56,9 @@ ui::NativeTheme::ColorId GetLegacyColorId(OmniboxPart part,
   return kInvalidColorId;
 }
 
-SkColor GetLegacyColor(OmniboxPart part, OmniboxTint tint, OmniboxState state) {
+SkColor GetLegacyColor(OmniboxPart part,
+                       OmniboxTint tint,
+                       OmniboxPartState state) {
   ui::NativeTheme* native_theme = nullptr;
 #if defined(USE_AURA)
   if (tint == OmniboxTint::DARK)
@@ -79,7 +81,7 @@ SkColor GetLegacyColor(OmniboxPart part, OmniboxTint tint, OmniboxState state) {
 
 SkColor GetOmniboxColor(OmniboxPart part,
                         OmniboxTint tint,
-                        OmniboxState state) {
+                        OmniboxPartState state) {
   if (!ui::MaterialDesignController::IsTouchOptimizedUiEnabled())
     return GetLegacyColor(part, tint, state);
 

chrome/browser/ui/omnibox/omnibox_theme.h

@@ -17,12 +17,12 @@ enum class OmniboxPart {
 enum class OmniboxTint { DARK, LIGHT, NATIVE };
 
 // An optional state for a given |OmniboxPart|.
-enum class OmniboxState { NORMAL, HOVERED, SELECTED, HOVERED_AND_SELECTED };
+enum class OmniboxPartState { NORMAL, HOVERED, SELECTED, HOVERED_AND_SELECTED };
 
 // Returns the color for the given |part| and |tint|. An optional |state| can be
 // provided for OmniboxParts that support stateful colors.
 SkColor GetOmniboxColor(OmniboxPart part,
                         OmniboxTint tint,
-                        OmniboxState state = OmniboxState::NORMAL);
+                        OmniboxPartState state = OmniboxPartState::NORMAL);
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_THEME_H_

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

@@ -256,12 +256,12 @@ OmniboxResultView::ResultViewState OmniboxResultView::GetState() const {
   return is_hovered_ ? HOVERED : NORMAL;
 }
 
-OmniboxState OmniboxResultView::GetThemeState() const {
+OmniboxPartState OmniboxResultView::GetThemeState() const {
   if (model_->IsSelectedIndex(model_index_)) {
-    return is_hovered_ ? OmniboxState::HOVERED_AND_SELECTED
-                       : OmniboxState::SELECTED;
+    return is_hovered_ ? OmniboxPartState::HOVERED_AND_SELECTED
+                       : OmniboxPartState::SELECTED;
   }
-  return is_hovered_ ? OmniboxState::HOVERED : OmniboxState::NORMAL;
+  return is_hovered_ ? OmniboxPartState::HOVERED : OmniboxPartState::NORMAL;
 }
 
 OmniboxTint OmniboxResultView::GetTint() const {

chrome/browser/ui/views/omnibox/omnibox_result_view.h

@@ -22,7 +22,7 @@
 #include "ui/views/view.h"
 
 class OmniboxPopupContentsView;
-enum class OmniboxState;
+enum class OmniboxPartState;
 enum class OmniboxTint;
 
 namespace gfx {
@@ -37,7 +37,7 @@ class OmniboxResultView : public views::View,
  public:
   // Keep these ordered from least dominant (normal) to most dominant
   // (selected).
-  // TODO(tapted): Remove these: replace with OmniboxState.
+  // TODO(tapted): Remove these: replace with OmniboxPartState.
   enum ResultViewState {
     NORMAL = 0,
     HOVERED,
@@ -73,7 +73,7 @@ class OmniboxResultView : public views::View,
   void OnSelected();
 
   ResultViewState GetState() const;
-  OmniboxState GetThemeState() const;
+  OmniboxPartState GetThemeState() const;
   OmniboxTint GetTint() const;
 
   // Notification that the match icon has changed and schedules a repaint.

chrome/browser/ui/views/omnibox/omnibox_tab_switch_button.cc

@@ -30,7 +30,7 @@ OmniboxTabSwitchButton::OmniboxTabSwitchButton(OmniboxResultView* result_view)
 void OmniboxTabSwitchButton::SetPressed() {
   SetBgColorOverride(color_utils::AlphaBlend(
       GetOmniboxColor(OmniboxPart::RESULTS_BACKGROUND, result_view_->GetTint(),
-                      OmniboxState::SELECTED),
+                      OmniboxPartState::SELECTED),
       SK_ColorBLACK, 0.8 * 255));
 }
 
@@ -81,7 +81,8 @@ void OmniboxTabSwitchButton::StateChanged(ButtonState old_state) {
 }
 
 SkColor OmniboxTabSwitchButton::GetBackgroundColor() const {
-  return GetOmniboxColor(
-      OmniboxPart::RESULTS_BACKGROUND, result_view_->GetTint(),
-      state() == STATE_HOVERED ? OmniboxState::HOVERED : OmniboxState::NORMAL);
+  return GetOmniboxColor(OmniboxPart::RESULTS_BACKGROUND,
+                         result_view_->GetTint(),
+                         state() == STATE_HOVERED ? OmniboxPartState::HOVERED
+                                                  : OmniboxPartState::NORMAL);
 }