Remove dependency on profile based theme provider

Use Views based theme provider instead of profile based theme provider
to reduce the dependencies on profile based theme provider.

Also, change to use OnThemeChanged() to make sure theme change can
propagate properly.

BUG=none

Change-Id: I9253999dbcd4bc167b3034ef27f48f2a3ff9364e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018484
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738801}

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

@@ -59,17 +59,36 @@ WidgetEventPair GetParentWidgetAndEvent(views::View* this_view,
 
 #endif  // !USE_AURA
 
+// Subclass for results view which sets the correct background color on
+// theme changes.
+class OmniboxResultsContentsView : public views::View {
+ public:
+  OmniboxResultsContentsView() = default;
+  ~OmniboxResultsContentsView() override = default;
+
+  void OnThemeChanged() override {
+    const SkColor background_color =
+        GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND);
+    SetBackground(views::CreateSolidBackground(background_color));
+  }
+};
+
 // View at the top of the frame which paints transparent pixels to make a hole
 // so that the location bar shows through.
 class TopBackgroundView : public views::View {
  public:
-  TopBackgroundView(const LocationBarView* location_bar,
-                    SkColor background_color) {
+  explicit TopBackgroundView(const LocationBarView* location_bar)
+      : location_bar_(location_bar) {}
+
+  void OnThemeChanged() override {
+    const SkColor background_color =
+        GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND);
+
     // Paint a stroke of the background color as a 1 px border to hide the
     // underlying antialiased location bar/toolbar edge.  The round rect here is
     // not antialiased, since the goal is to completely cover the underlying
     // pixels, and AA would let those on the edge partly bleed through.
-    SetBackground(location_bar->CreateRoundRectBackground(
+    SetBackground(location_bar_->CreateRoundRectBackground(
         SK_ColorTRANSPARENT, background_color, SkBlendMode::kSrc, false));
   }
 
@@ -110,6 +129,9 @@ class TopBackgroundView : public views::View {
     return nullptr;
   }
 #endif  // !USE_AURA
+
+ private:
+  const LocationBarView* location_bar_;
 };
 
 // Insets used to position |contents_| within |contents_host_|.
@@ -125,23 +147,18 @@ RoundedOmniboxResultsFrame::RoundedOmniboxResultsFrame(
     LocationBarView* location_bar)
     : contents_(contents) {
   // Host the contents in its own View to simplify layout and customization.
-  contents_host_ = new views::View();
+  contents_host_ = new OmniboxResultsContentsView();
   contents_host_->SetPaintToLayer();
   contents_host_->layer()->SetFillsBoundsOpaquely(false);
 
-  // Use a solid background with rounded corners.
-  const SkColor background_color = GetOmniboxColor(
-      &ThemeService::GetThemeProviderForProfile(location_bar->profile()),
-      OmniboxPart::RESULTS_BACKGROUND);
-  contents_host_->SetBackground(views::CreateSolidBackground(background_color));
-
+  // Use rounded corners.
   int corner_radius =
       views::LayoutProvider::Get()->GetCornerRadiusMetric(views::EMPHASIS_HIGH);
   contents_host_->layer()->SetRoundedCornerRadius(
       gfx::RoundedCornersF(corner_radius));
   contents_host_->layer()->SetIsFastRoundedCorner(true);
 
-  top_background_ = new TopBackgroundView(location_bar, background_color);
+  top_background_ = new TopBackgroundView(location_bar);
   contents_host_->AddChildView(top_background_);
   contents_host_->AddChildView(contents_);
 
@@ -151,11 +168,6 @@ RoundedOmniboxResultsFrame::RoundedOmniboxResultsFrame(
       gfx::kPlaceholderColor);
   border->SetCornerRadius(corner_radius);
   border->set_md_shadow_elevation(kElevation);
-  // Use a darker shadow that's more visible on darker tints.
-  border->set_md_shadow_color(color_utils::IsDark(background_color)
-                                  ? SK_ColorBLACK
-                                  : gfx::kGoogleGrey800);
-
   SetBorder(std::move(border));
 
   AddChildView(contents_host_);
@@ -256,3 +268,16 @@ void RoundedOmniboxResultsFrame::OnMouseEvent(ui::MouseEvent* event) {
 }
 
 #endif  // !USE_AURA
+
+void RoundedOmniboxResultsFrame::OnThemeChanged() {
+  const SkColor background_color =
+      GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND);
+
+  // Use a darker shadow that's more visible on darker tints.
+  views::BubbleBorder* border =
+      static_cast<views::BubbleBorder*>(this->border());
+  border->set_md_shadow_color(color_utils::IsDark(background_color)
+                                  ? SK_ColorBLACK
+                                  : gfx::kGoogleGrey800);
+  SchedulePaint();
+}

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

@@ -41,6 +41,7 @@ class RoundedOmniboxResultsFrame : public views::View {
   void OnMouseMoved(const ui::MouseEvent& event) override;
   void OnMouseEvent(ui::MouseEvent* event) override;
 #endif  // !USE_AURA
+  void OnThemeChanged() override;
 
  private:
   views::View* top_background_ = nullptr;