Revert "Side Panel: update focus rings to have correct contrast and respect accent color settings."

This reverts commit 95a3da5.

Reason for revert: This breaks for incognito since views passes in a dark color for the background while webui returns light colors for text. Reverting this in favor of waiting for ongoing working for supporting color provider in webui to land before making these changes.

Original change's description:
> Side Panel: update focus rings to have correct contrast and respect accent color settings.
>
> Update side panel focus ring colors on theme change using cascading
> accent color.
>
> Bug: 1250506
> Change-Id: Ie61cacb9a8c41382a21b735ff359d369a101a0f2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3193213
> Reviewed-by: John Lee <[email protected]>
> Reviewed-by: Alex Gough <[email protected]>
> Reviewed-by: Peter Boström <[email protected]>
> Commit-Queue: Caroline Rising <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#929675}

Bug: 1250506
Change-Id: Id339cc618892f39968e08b610780c0144978dfc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3216950
Bot-Commit: Rubber Stamper <[email protected]>
Reviewed-by: Peter Boström <[email protected]>
Reviewed-by: Alex Gough <[email protected]>
Reviewed-by: John Lee <[email protected]>
Commit-Queue: Caroline Rising <[email protected]>
Cr-Commit-Position: refs/heads/main@{#933209}

Author: Caroline Rising

chrome/browser/resources/read_later/BUILD.gn

@@ -148,7 +148,6 @@ ts_library("build_ts") {
   definitions = [
     "//tools/typescript/definitions/bookmark_manager_private.d.ts",
     "//tools/typescript/definitions/bookmarks.d.ts",
-    "//tools/typescript/definitions/chrome_send.d.ts",
     "//tools/typescript/definitions/chrome_event.d.ts",
     "//tools/typescript/definitions/metrics_private.d.ts",
   ]

chrome/browser/resources/read_later/app.html

@@ -53,7 +53,6 @@
   }
 
   :host([side-panel]) #currentPageActionButton {
-    --focus-shadow-color: var(--side-panel-focus-outline-color);
     margin: 8px 16px 0 16px;
   }
 

chrome/browser/resources/read_later/read_later_api_proxy.js

@@ -49,12 +49,6 @@ export class ReadLaterApiProxy {
 
   closeUI() {}
 
-  /**
-   * @return {!Promise<{colors: !Object<string, string>}>} Object with CSS
-   *     variables as keys and rgba strings as values
-   */
-  getColors() {}
-
   /** @return {!readLater.mojom.PageCallbackRouter} */
   getCallbackRouter() {}
 }
@@ -119,11 +113,6 @@ export class ReadLaterApiProxyImpl {
     this.handler.closeUI();
   }
 
-  /** @override */
-  getColors() {
-    return this.handler.getThemeColors();
-  }
-
   /** @override */
   getCallbackRouter() {
     return this.callbackRouter;

chrome/browser/resources/read_later/side_panel/app.html

@@ -1,8 +1,5 @@
 <style include="mwb-element-shared-style">
   :host {
-    --mwb-icon-button-focus-ring-color: var(--side-panel-focus-outline-color);
-    --mwb-background-color: var(--side-panel-background-color);
-    background: var(--side-panel-background-color);
     color: var(--cr-primary-text-color);
     display: flex;
     flex-direction: column;

chrome/browser/resources/read_later/side_panel/app.ts

@@ -14,19 +14,13 @@ import '../strings.m.js';
 import './bookmarks_list.js';
 
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
-import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
-import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-
+import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {ReadLaterApiProxy, ReadLaterApiProxyImpl} from '../read_later_api_proxy.js';
 
 // Key for localStorage object that refers to the last active tab's ID.
 export const LOCAL_STORAGE_TAB_ID_KEY = 'lastActiveTab';
 
-const SidePanelAppElementBase =
-    mixinBehaviors([WebUIListenerBehavior], PolymerElement) as
-    {new (): PolymerElement & WebUIListenerBehavior};
-
-export class SidePanelAppElement extends SidePanelAppElementBase {
+export class SidePanelAppElement extends PolymerElement {
   static get is() {
     return 'side-panel-app';
   }
@@ -58,14 +52,6 @@ export class SidePanelAppElement extends SidePanelAppElementBase {
 
   connectedCallback() {
     super.connectedCallback();
-
-    this.fetchAndUpdateColors_();
-    this.addWebUIListener('theme-changed', () => {
-      // Refetch theme colors on theme change.
-      this.fetchAndUpdateColors_();
-    });
-    chrome.send('observeThemeChanges');
-
     const lastActiveTab = window.localStorage[LOCAL_STORAGE_TAB_ID_KEY];
     if (loadTimeData.getBoolean('hasUnseenReadingListEntries')) {
       window.localStorage[LOCAL_STORAGE_TAB_ID_KEY] = 'readingList';
@@ -77,14 +63,6 @@ export class SidePanelAppElement extends SidePanelAppElementBase {
     this.apiProxy_.showUI();
   }
 
-  private fetchAndUpdateColors_() {
-    this.apiProxy_.getColors().then(({colors}) => {
-      for (const [cssVariable, value] of Object.entries(colors)) {
-        this.style.setProperty(cssVariable, value);
-      }
-    });
-  }
-
   private getTabNames_(): string[] {
     return Object.values(this.tabs_);
   }

chrome/browser/resources/read_later/side_panel/side_panel.html

@@ -16,8 +16,15 @@
     }
 
     body {
+      background: white;
       overflow: auto;
     }
+
+    @media (prefers-color-scheme: dark) {
+      body {
+        background: var(--google-grey-900);
+      }
+    }
   </style>
 </head>
 <body>

chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc

@@ -9,7 +9,6 @@
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/rounded_corners_f.h"
 #include "ui/views/widget/widget.h"
 
@@ -30,11 +29,6 @@ content::WebContents::CreateParams GetWebContentsCreateParams(
 
 }  // namespace
 
-SkColor BubbleContentsWrapper::Host::GetColorProviderColor(ui::ColorId id) {
-  NOTREACHED();
-  return gfx::kPlaceholderColor;
-}
-
 bool BubbleContentsWrapper::Host::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
@@ -143,10 +137,6 @@ void BubbleContentsWrapper::HideContextMenu() {
     host_->HideCustomContextMenu();
 }
 
-SkColor BubbleContentsWrapper::GetColorProviderColor(ui::ColorId id) {
-  return host_ ? host_->GetColorProviderColor(id) : gfx::kPlaceholderColor;
-}
-
 base::WeakPtr<BubbleContentsWrapper::Host> BubbleContentsWrapper::GetHost() {
   return host_;
 }

chrome/browser/ui/views/bubble/bubble_contents_wrapper.h

@@ -16,7 +16,6 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/referrer.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/color/color_id.h"
 #include "ui/webui/mojo_bubble_web_ui_controller.h"
 
 namespace content {
@@ -40,7 +39,6 @@ class BubbleContentsWrapper : public content::WebContentsDelegate,
         gfx::Point point,
         std::unique_ptr<ui::MenuModel> menu_model) {}
     virtual void HideCustomContextMenu() {}
-    virtual SkColor GetColorProviderColor(ui::ColorId id);
     virtual void ResizeDueToAutoResize(content::WebContents* source,
                                        const gfx::Size& new_size) {}
     virtual bool HandleKeyboardEvent(
@@ -79,7 +77,6 @@ class BubbleContentsWrapper : public content::WebContentsDelegate,
   void ShowContextMenu(gfx::Point point,
                        std::unique_ptr<ui::MenuModel> menu_model) override;
   void HideContextMenu() override;
-  SkColor GetColorProviderColor(ui::ColorId id) override;
 
   // Reloads the WebContents hosting the WebUI.
   virtual void ReloadWebContents() = 0;

chrome/browser/ui/views/toolbar/read_later_toolbar_button.cc

@@ -12,7 +12,6 @@
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 #include "chrome/browser/feature_engagement/tracker_factory.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/read_later/reading_list_model_factory.h"
@@ -27,10 +26,7 @@
 #include "components/feature_engagement/public/feature_constants.h"
 #include "components/feature_engagement/public/tracker.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/color/color_id.h"
-#include "ui/color/color_provider.h"
 #include "ui/views/accessibility/view_accessibility.h"
-#include "ui/views/cascading_property.h"
 #include "ui/views/controls/button/button_controller.h"
 #include "ui/views/controls/dot_indicator.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ -62,9 +58,6 @@ class ReadLaterSidePanelWebView : public views::WebView,
     SetWebContents(contents_wrapper_->web_contents());
     set_allow_accelerators(true);
 
-    views::SetCascadingColorProviderColor(
-        this, views::kCascadingBackgroundColor, ui::kColorBubbleBackground);
-
     if (base::FeatureList::IsEnabled(features::kSidePanelDragAndDrop)) {
       extensions::BookmarkManagerPrivateDragEventRouter::CreateForWebContents(
           contents_wrapper_->web_contents());
@@ -125,16 +118,6 @@ class ReadLaterSidePanelWebView : public views::WebView,
     if (context_menu_runner_)
       context_menu_runner_->Cancel();
   }
-  SkColor GetColorProviderColor(ui::ColorId id) override {
-    switch (id) {
-      case ui::kColorDialogBackground:
-        return GetCascadingBackgroundColor(this);
-      case ui::kColorFocusableBorderFocused:
-        return GetCascadingAccentColor(this);
-      default:
-        return GetColorProvider()->GetColor(id);
-    }
-  }
   bool HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override {

chrome/browser/ui/webui/read_later/read_later.mojom

@@ -62,12 +62,6 @@ interface PageHandler {
 
   // Notify the backend that the dialog should be closed.
   CloseUI();
-
-  // Get colors of the current theme with CSS variables as keys and rgba strings
-  // as values.
-  // TODO(corising): This is also done in tab_strip.mojom. We should find a way
-  // to unify this.
-  GetThemeColors() => (map<string, string> colors);
 };
 
 enum CurrentPageActionButtonState {

chrome/browser/ui/webui/read_later/read_later_page_handler.cc

@@ -36,7 +36,6 @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/window_open_disposition.mojom.h"
 #include "ui/base/window_open_disposition.h"
-#include "ui/gfx/color_utils.h"
 #include "url/gurl.h"
 
 namespace {
@@ -279,21 +278,6 @@ void ReadLaterPageHandler::CloseUI() {
     embedder->CloseUI();
 }
 
-void ReadLaterPageHandler::GetThemeColors(GetThemeColorsCallback callback) {
-  base::flat_map<std::string, std::string> colors;
-  auto embedder = read_later_ui_->embedder();
-  if (!embedder) {
-    std::move(callback).Run(std::move(colors));
-    return;
-  }
-  colors["--side-panel-focus-outline-color"] = color_utils::SkColorToRgbaString(
-      embedder->GetColorProviderColor(ui::kColorFocusableBorderFocused));
-  colors["--side-panel-background-color"] = color_utils::SkColorToRgbaString(
-      embedder->GetColorProviderColor(ui::kColorDialogBackground));
-
-  std::move(callback).Run(std::move(colors));
-}
-
 void ReadLaterPageHandler::ReadingListModelCompletedBatchUpdates(
     const ReadingListModel* model) {
   DCHECK(model == reading_list_model_);

chrome/browser/ui/webui/read_later/read_later_page_handler.h

@@ -53,7 +53,6 @@ class ReadLaterPageHandler : public read_later::mojom::PageHandler,
   void UpdateCurrentPageActionButtonState() override;
   void ShowUI() override;
   void CloseUI() override;
-  void GetThemeColors(GetThemeColorsCallback callback) override;
 
   // ReadingListModelObserver:
   void ReadingListModelLoaded(const ReadingListModel* model) override {}

chrome/browser/ui/webui/read_later/read_later_ui.cc

@@ -14,7 +14,6 @@
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/read_later/read_later_page_handler.h"
 #include "chrome/browser/ui/webui/read_later/side_panel/bookmarks_page_handler.h"
-#include "chrome/browser/ui/webui/theme_handler.h"
 #include "chrome/browser/ui/webui/webui_util.h"
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/grit/generated_resources.h"
@@ -43,7 +42,7 @@ void AddLocalizedString(content::WebUIDataSource* source,
 }  // namespace
 
 ReadLaterUI::ReadLaterUI(content::WebUI* web_ui)
-    : ui::MojoBubbleWebUIController(web_ui, /*enable_chrome_send=*/true),
+    : ui::MojoBubbleWebUIController(web_ui),
       webui_load_timer_(web_ui->GetWebContents(),
                         "ReadingList.WebUI.LoadDocumentTime",
                         "ReadingList.WebUI.LoadCompletedTime") {
@@ -100,8 +99,6 @@ ReadLaterUI::ReadLaterUI(content::WebUI* web_ui)
                       : IDR_READ_LATER_READ_LATER_HTML);
   content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
                                 source);
-
-  web_ui->AddMessageHandler(std::make_unique<ThemeHandler>());
 }
 
 ReadLaterUI::~ReadLaterUI() = default;

chrome/test/data/webui/read_later/test_read_later_api_proxy.js

@@ -20,17 +20,13 @@ export class TestReadLaterApiProxy extends TestBrowserProxy {
       'updateCurrentPageActionButtonState',
       'showUI',
       'closeUI',
-      'getColors',
     ]);
 
     /** @type {!readLater.mojom.PageCallbackRouter} */
     this.callbackRouter = new readLater.mojom.PageCallbackRouter();
 
     /** @private {!readLater.mojom.ReadLaterEntriesByStatus} */
     this.entries_;
-
-    /** @private {!Object<string, string>} */
-    this.colors_ = {};
   }
 
   /** @override */
@@ -79,12 +75,6 @@ export class TestReadLaterApiProxy extends TestBrowserProxy {
     this.methodCalled('closeUI');
   }
 
-  /** @override */
-  getColors() {
-    this.methodCalled('getColors');
-    return Promise.resolve({colors: this.colors_});
-  }
-
   /** @override */
   getCallbackRouter() {
     return this.callbackRouter;

ui/webui/mojo_bubble_web_ui_controller.h

@@ -20,9 +20,6 @@ namespace ui {
 
 class MenuModel;
 
-using ColorId = int;
-using SkColor = uint32_t;
-
 class MojoBubbleWebUIController : public MojoWebUIController {
  public:
   class Embedder {
@@ -32,7 +29,6 @@ class MojoBubbleWebUIController : public MojoWebUIController {
     virtual void ShowContextMenu(gfx::Point point,
                                  std::unique_ptr<ui::MenuModel> menu_model) = 0;
     virtual void HideContextMenu() = 0;
-    virtual SkColor GetColorProviderColor(ColorId id) = 0;
   };
 
   // By default MojoBubbleWebUIController do not have normal WebUI bindings.