Move DarkModeObserver to ui/native_theme

In preparation for using the observer in WebContentsImpl, make it
available for content/.

Bug: 889087
Change-Id: Iff4dbfae5525c6bae1655662d5f29208a024da28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574802Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Ramya Nagarajan <ramyan@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653639}

chrome/browser/search/instant_service.cc

@@ -32,7 +32,6 @@
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/dark_mode_observer.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_paths.h"
@@ -53,6 +52,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/native_theme/dark_mode_observer.h"
 
 namespace {
 
@@ -761,7 +761,7 @@ void InstantService::AddValidBackdropUrlForTesting(const GURL& url) const {
 }
 
 void InstantService::CreateDarkModeObserver(ui::NativeTheme* theme) {
-  dark_mode_observer_ = std::make_unique<DarkModeObserver>(
+  dark_mode_observer_ = std::make_unique<ui::DarkModeObserver>(
       theme, base::BindRepeating(&InstantService::OnDarkModeChanged,
                                  weak_ptr_factory_.GetWeakPtr()));
   dark_mode_observer_->Start();

chrome/browser/search/instant_service.h

@@ -32,7 +32,6 @@
 #error "Instant is only used on desktop";
 #endif
 
-class DarkModeObserver;
 class InstantIOContext;
 class InstantServiceObserver;
 class NtpBackgroundService;
@@ -44,6 +43,10 @@ namespace content {
 class RenderProcessHost;
 }  // namespace content
 
+namespace ui {
+class DarkModeObserver;
+}  // namespace ui
+
 // Tracks render process host IDs that are associated with Instant, i.e.
 // processes that are used to render an NTP. Also responsible for keeping
 // necessary information (most visited tiles and theme info) updated in those
@@ -254,7 +257,7 @@ class InstantService : public KeyedService,
   PrefService* pref_service_;
 
   // Keeps track of any changes to system dark mode.
-  std::unique_ptr<DarkModeObserver> dark_mode_observer_;
+  std::unique_ptr<ui::DarkModeObserver> dark_mode_observer_;
 
   NtpBackgroundService* background_service_;
 

chrome/browser/ui/BUILD.gn

@@ -108,8 +108,6 @@ jumbo_split_static_library("ui") {
     "confirm_bubble.h",
     "crypto_module_password_dialog.h",
     "cryptuiapi_shim.h",
-    "dark_mode_observer.cc",
-    "dark_mode_observer.h",
     "enterprise_startup_dialog.h",
     "find_bar/find_bar.h",
     "find_bar/find_bar_state.h",

chrome/browser/ui/webui/dark_mode_handler.h

@@ -11,8 +11,8 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
-#include "chrome/browser/ui/dark_mode_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
+#include "ui/native_theme/dark_mode_observer.h"
 #include "ui/native_theme/native_theme.h"
 
 namespace base {
@@ -70,7 +70,7 @@ class DarkModeHandler : public content::WebUIMessageHandler {
   // Profile to update data sources on. Injected for testing.
   Profile* const profile_;
 
-  DarkModeObserver dark_mode_observer_;
+  ui::DarkModeObserver dark_mode_observer_;
 
   // Populated if feature is enabled.
   std::string source_name_;

chrome/browser/ui/webui/ntp/new_tab_ui.h

@@ -7,10 +7,10 @@
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/ui/dark_mode_observer.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_ui_controller.h"
+#include "ui/native_theme/dark_mode_observer.h"
 
 class GURL;
 class Profile;
@@ -80,7 +80,7 @@ class NewTabUI : public content::WebUIController {
 
   Profile* GetProfile() const;
 
-  DarkModeObserver dark_mode_observer_;
+  ui::DarkModeObserver dark_mode_observer_;
 
   PrefChangeRegistrar pref_change_registrar_;
 

ui/native_theme/BUILD.gn

@@ -14,6 +14,8 @@ jumbo_component("native_theme") {
     "caption_style_win.cc",
     "common_theme.cc",
     "common_theme.h",
+    "dark_mode_observer.cc",
+    "dark_mode_observer.h",
     "native_theme.cc",
     "native_theme.h",
     "native_theme_android.cc",

chrome/browser/ui/dark_mode_observer.cc → ui/native_theme/dark_mode_observer.cc

@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/dark_mode_observer.h"
+#include "ui/native_theme/dark_mode_observer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_observer.h"
 
+namespace ui {
+
 DarkModeObserver::DarkModeObserver(
-    ui::NativeTheme* theme,
+    NativeTheme* theme,
     const base::RepeatingCallback<void(bool)>& callback)
     : theme_(theme),
       callback_(callback),
@@ -28,7 +30,7 @@ void DarkModeObserver::Stop() {
   theme_observer_.RemoveAll();
 }
 
-void DarkModeObserver::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
+void DarkModeObserver::OnNativeThemeUpdated(NativeTheme* observed_theme) {
   DCHECK_EQ(observed_theme, theme_);
   RunCallbackIfChanged();
 }
@@ -40,3 +42,5 @@ void DarkModeObserver::RunCallbackIfChanged() {
   in_dark_mode_ = in_dark_mode;
   callback_.Run(in_dark_mode_);
 }
+
+}  // namespace ui

chrome/browser/ui/dark_mode_observer.h → ui/native_theme/dark_mode_observer.h

@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_DARK_MODE_OBSERVER_H_
-#define CHROME_BROWSER_UI_DARK_MODE_OBSERVER_H_
+#ifndef UI_NATIVE_THEME_DARK_MODE_OBSERVER_H_
+#define UI_NATIVE_THEME_DARK_MODE_OBSERVER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "ui/native_theme/native_theme_observer.h"
 
-class DarkModeObserver : public ui::NativeThemeObserver {
+namespace ui {
+
+class NATIVE_THEME_EXPORT DarkModeObserver : public NativeThemeObserver {
  public:
   // Observe |theme| for changes and run |callback| if detected.
-  DarkModeObserver(ui::NativeTheme* theme,
+  DarkModeObserver(NativeTheme* theme,
                    const base::RepeatingCallback<void(bool)>& callback);
 
   ~DarkModeObserver() override;
@@ -29,22 +31,24 @@ class DarkModeObserver : public ui::NativeThemeObserver {
   bool InDarkMode() const { return in_dark_mode_; }
 
  private:
-  // ui::NativeThemeObserver:
-  void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
+  // NativeThemeObserver:
+  void OnNativeThemeUpdated(NativeTheme* observed_theme) override;
 
   // Run |callback_| if |theme_->SystemDarkModeEnabled()| != |in_dark_mode_|.
   void RunCallbackIfChanged();
 
   // The theme to query/watch for changes.
-  ui::NativeTheme* const theme_;
+  NativeTheme* const theme_;
 
   base::RepeatingCallback<void(bool)> callback_;
 
   bool in_dark_mode_;
 
-  ScopedObserver<ui::NativeTheme, DarkModeObserver> theme_observer_;
+  ScopedObserver<NativeTheme, DarkModeObserver> theme_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(DarkModeObserver);
 };
 
-#endif  // CHROME_BROWSER_UI_DARK_MODE_OBSERVER_H_
+}  // namespace ui
+
+#endif  // UI_NATIVE_THEME_DARK_MODE_OBSERVER_H_