Declare kFrameActiveColorKey in chromeos/ui/base/

.. window_properties.h. Also kFrameInactiveColorKey.

This is the last step before moving default_frame_header.cc|h
to //chromeos/ui/frame/.

BUG=1113900
R=jamescook@chromium.org
TBR=oshima@chromium.org

Change-Id: I2355f497bd94a9569d9a35ff3f95c70c436201cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521114
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825811}

ash/frame/default_frame_header_unittest.cc

@@ -8,12 +8,12 @@
 
 #include "ash/frame/non_client_frame_view_ash.h"
 #include "ash/public/cpp/shell_window_ids.h"
-#include "ash/public/cpp/window_properties.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/desks/desks_util.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "base/test/icu_test_util.h"
+#include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/frame/caption_buttons/frame_back_button.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ui/aura/window.h"
@@ -28,6 +28,8 @@
 using chromeos::FrameBackButton;
 using chromeos::FrameCaptionButtonContainerView;
 using chromeos::FrameHeader;
+using chromeos::kFrameActiveColorKey;
+using chromeos::kFrameInactiveColorKey;
 using views::NonClientFrameView;
 using views::Widget;
 

ash/frame/header_view.cc

@@ -7,11 +7,11 @@
 #include <memory>
 
 #include "ash/public/cpp/default_frame_header.h"
-#include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/auto_reset.h"
+#include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/frame/caption_buttons/caption_button_model.h"
 #include "chromeos/ui/frame/caption_buttons/frame_back_button.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
@@ -24,6 +24,9 @@
 
 namespace ash {
 
+using ::chromeos::kFrameActiveColorKey;
+using ::chromeos::kFrameInactiveColorKey;
+
 // The view used to draw the content (background and title string)
 // of the header. This is a separate view so that it can use
 // different scaling strategy than the rest of the frame such

ash/frame/non_client_frame_view_ash.cc

@@ -41,6 +41,8 @@ DEFINE_UI_CLASS_PROPERTY_TYPE(ash::NonClientFrameViewAsh*)
 namespace ash {
 
 using ::chromeos::ImmersiveFullscreenController;
+using ::chromeos::kFrameActiveColorKey;
+using ::chromeos::kFrameInactiveColorKey;
 using ::chromeos::kImmersiveImpliedByFullscreen;
 using ::chromeos::WindowStateType;
 

ash/frame/non_client_frame_view_ash_unittest.cc

@@ -11,7 +11,6 @@
 #include "ash/frame/wide_frame_view.h"
 #include "ash/public/cpp/ash_switches.h"
 #include "ash/public/cpp/default_frame_header.h"
-#include "ash/public/cpp/window_properties.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -24,6 +23,7 @@
 #include "ash/wm/wm_event.h"
 #include "base/command_line.h"
 #include "base/containers/flat_set.h"
+#include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller_test_api.h"
@@ -53,6 +53,8 @@ using ::chromeos::FrameCaptionButtonContainerView;
 using ::chromeos::ImmersiveFullscreenController;
 using ::chromeos::ImmersiveFullscreenControllerDelegate;
 using ::chromeos::ImmersiveFullscreenControllerTestApi;
+using ::chromeos::kFrameActiveColorKey;
+using ::chromeos::kFrameInactiveColorKey;
 
 // A views::WidgetDelegate which uses a NonClientFrameViewAsh.
 class NonClientFrameViewAshTestWidgetDelegate

ash/public/cpp/default_frame_header.cc

@@ -4,7 +4,6 @@
 
 #include "ash/public/cpp/default_frame_header.h"
 
-#include "ash/public/cpp/window_properties.h"
 #include "base/logging.h"  // DCHECK
 #include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "chromeos/ui/base/window_properties.h"
@@ -22,6 +21,8 @@
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/caption_button_layout_constants.h"
 
+using chromeos::kFrameActiveColorKey;
+using chromeos::kFrameInactiveColorKey;
 using views::Widget;
 
 namespace {

ash/public/cpp/window_properties.cc

@@ -57,12 +57,6 @@ DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(SkRegion,
 DEFINE_UI_CLASS_PROPERTY_KEY(aura::Window*,
                              kTabDraggingSourceWindowKey,
                              nullptr)
-DEFINE_UI_CLASS_PROPERTY_KEY(SkColor,
-                             kFrameActiveColorKey,
-                             chromeos::kDefaultFrameColor)
-DEFINE_UI_CLASS_PROPERTY_KEY(SkColor,
-                             kFrameInactiveColorKey,
-                             chromeos::kDefaultFrameColor)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16,
                                    kWindowOverviewTitleKey,
                                    nullptr)

ash/public/cpp/window_properties.h

@@ -178,13 +178,6 @@ ASH_PUBLIC_EXPORT extern const aura::WindowProperty<SkRegion*>* const
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<aura::Window*>* const
     kTabDraggingSourceWindowKey;
 
-// A property key to store the active color on the window frame.
-ASH_PUBLIC_EXPORT extern const aura::WindowProperty<SkColor>* const
-    kFrameActiveColorKey;
-// A property key to store the inactive color on the window frame.
-ASH_PUBLIC_EXPORT extern const aura::WindowProperty<SkColor>* const
-    kFrameInactiveColorKey;
-
 // A property key whose value is shown in alt-tab/overview mode. If non-value
 // is set, the window's title is used.
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<base::string16*>* const

ash/shortcut_viewer/BUILD.gn

@@ -32,6 +32,7 @@ source_set("shortcut_viewer") {
     "//ash/shortcut_viewer/strings",
     "//ash/shortcut_viewer/vector_icons",
     "//cc/paint",
+    "//chromeos/ui/base",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/chromeos/events",

ash/shortcut_viewer/views/keyboard_shortcut_view.cc

@@ -32,6 +32,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
+#include "chromeos/ui/base/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/accelerators/accelerator.h"
@@ -184,8 +185,8 @@ views::Widget* KeyboardShortcutView::Toggle(aura::Window* context) {
 
     // Set frame view Active and Inactive colors, both are SK_ColorWHITE.
     aura::Window* window = g_ksv_view->GetWidget()->GetNativeWindow();
-    window->SetProperty(ash::kFrameActiveColorKey, SK_ColorWHITE);
-    window->SetProperty(ash::kFrameInactiveColorKey, SK_ColorWHITE);
+    window->SetProperty(chromeos::kFrameActiveColorKey, SK_ColorWHITE);
+    window->SetProperty(chromeos::kFrameInactiveColorKey, SK_ColorWHITE);
 
     // Set shelf icon.
     const ash::ShelfID shelf_id(ash::kInternalAppIdKeyboardShortcutViewer);

chrome/browser/ui/views/extensions/extension_dialog.cc

@@ -30,7 +30,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/public/cpp/tablet_mode.h"
-#include "ash/public/cpp/window_properties.h"
+#include "chromeos/ui/base/window_properties.h"
 #include "ui/aura/window.h"
 #endif
 
@@ -226,12 +226,12 @@ ExtensionDialog::ExtensionDialog(
   aura::Window* native_view = window->GetNativeWindow();
   if (init_params.title_color) {
     // Frame active color changes the title color when dialog is active.
-    native_view->SetProperty(ash::kFrameActiveColorKey,
+    native_view->SetProperty(chromeos::kFrameActiveColorKey,
                              init_params.title_color.value());
   }
   if (init_params.title_inactive_color) {
     // Frame inactive color changes the title color when dialog is inactive.
-    native_view->SetProperty(ash::kFrameInactiveColorKey,
+    native_view->SetProperty(chromeos::kFrameInactiveColorKey,
                              init_params.title_inactive_color.value());
   }
 #endif

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

@@ -730,12 +730,12 @@ void BrowserNonClientFrameViewAsh::OnUpdateFrameColor() {
   }
 
   if (active_color) {
-    window->SetProperty(ash::kFrameActiveColorKey, *active_color);
-    window->SetProperty(ash::kFrameInactiveColorKey,
+    window->SetProperty(chromeos::kFrameActiveColorKey, *active_color);
+    window->SetProperty(chromeos::kFrameInactiveColorKey,
                         inactive_color.value_or(*active_color));
   } else {
-    window->ClearProperty(ash::kFrameActiveColorKey);
-    window->ClearProperty(ash::kFrameInactiveColorKey);
+    window->ClearProperty(chromeos::kFrameActiveColorKey);
+    window->ClearProperty(chromeos::kFrameInactiveColorKey);
   }
 
   if (frame_header_)

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

@@ -1004,8 +1004,10 @@ IN_PROC_BROWSER_TEST_P(WebAppNonClientFrameViewAshTest,
 IN_PROC_BROWSER_TEST_P(WebAppNonClientFrameViewAshTest, FrameThemeColorIsSet) {
   SetUpWebApp();
   aura::Window* window = browser_view_->GetWidget()->GetNativeWindow();
-  EXPECT_EQ(GetThemeColor(), window->GetProperty(ash::kFrameActiveColorKey));
-  EXPECT_EQ(GetThemeColor(), window->GetProperty(ash::kFrameInactiveColorKey));
+  EXPECT_EQ(GetThemeColor(),
+            window->GetProperty(chromeos::kFrameActiveColorKey));
+  EXPECT_EQ(GetThemeColor(),
+            window->GetProperty(chromeos::kFrameInactiveColorKey));
   EXPECT_EQ(gfx::kGoogleGrey200, GetActiveColor());
 }
 
@@ -1382,7 +1384,8 @@ IN_PROC_BROWSER_TEST_P(BrowserNonClientFrameViewAshTest, AppFrameColor) {
   aura::Window* window = app_browser->window()->GetNativeWindow();
   window->Show();
 
-  SkColor active_frame_color = window->GetProperty(ash::kFrameActiveColorKey);
+  SkColor active_frame_color =
+      window->GetProperty(chromeos::kFrameActiveColorKey);
   EXPECT_EQ(active_frame_color, SkColorSetRGB(253, 254, 255))
       << "RGB: " << SkColorGetR(active_frame_color) << ", "
       << SkColorGetG(active_frame_color) << ", "

chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc

@@ -8,7 +8,6 @@
 
 #include "ash/public/cpp/keyboard/keyboard_switches.h"
 #include "ash/public/cpp/test/shell_test_api.h"
-#include "ash/public/cpp/window_properties.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ -34,6 +33,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/constants/chromeos_features.h"
+#include "chromeos/ui/base/window_properties.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -625,9 +625,10 @@ IN_PROC_BROWSER_TEST_P(SelectFileDialogExtensionFlagTest, DialogColoredTitle) {
       dialog_->GetRenderViewHost()->GetMainFrame();
   aura::Window* dialog_window =
       frame_host->GetNativeView()->GetToplevelWindow();
-  SkColor active_color = dialog_window->GetProperty(ash::kFrameActiveColorKey);
+  SkColor active_color =
+      dialog_window->GetProperty(chromeos::kFrameActiveColorKey);
   SkColor inactive_color =
-      dialog_window->GetProperty(ash::kFrameInactiveColorKey);
+      dialog_window->GetProperty(chromeos::kFrameInactiveColorKey);
 
   constexpr SkColor kFilesNgTitleColor = gfx::kGoogleGrey200;
   if (GetParam()) {

chromeos/ui/base/window_properties.cc

@@ -4,6 +4,7 @@
 
 #include "chromeos/ui/base/window_properties.h"
 
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "chromeos/ui/base/window_pin_type.h"
 #include "chromeos/ui/base/window_state_type.h"
 #include "ui/base/class_property.h"
@@ -14,6 +15,11 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(COMPONENT_EXPORT(CHROMEOS_UI_BASE),
 
 namespace chromeos {
 
+DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kFrameActiveColorKey, kDefaultFrameColor)
+DEFINE_UI_CLASS_PROPERTY_KEY(SkColor,
+                             kFrameInactiveColorKey,
+                             kDefaultFrameColor)
+
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kFrameRestoreLookKey, false)
 
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideShelfWhenFullscreenKey, true)

chromeos/ui/base/window_properties.h

@@ -6,6 +6,7 @@
 #define CHROMEOS_UI_BASE_WINDOW_PROPERTIES_H_
 
 #include "base/component_export.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/class_property.h"
 
 namespace gfx {
@@ -21,6 +22,14 @@ enum class WindowPinType;
 
 // Alphabetical sort.
 
+// A property key to store the active color on the window frame.
+COMPONENT_EXPORT(CHROMEOS_UI_BASE)
+extern const ui::ClassProperty<SkColor>* const kFrameActiveColorKey;
+
+// A property key to store the inactive color on the window frame.
+COMPONENT_EXPORT(CHROMEOS_UI_BASE)
+extern const ui::ClassProperty<SkColor>* const kFrameInactiveColorKey;
+
 // A property key that is set to true when the window frame should look like it
 // is in restored state, but actually isn't. Set while dragging a maximized
 // window.

components/exo/client_controlled_shell_surface.cc

@@ -744,8 +744,8 @@ void ClientControlledShellSurface::OnSetFrameColors(SkColor active_color,
   ShellSurfaceBase::OnSetFrameColors(active_color, inactive_color);
   if (wide_frame_) {
     aura::Window* window = wide_frame_->GetWidget()->GetNativeWindow();
-    window->SetProperty(ash::kFrameActiveColorKey, active_color);
-    window->SetProperty(ash::kFrameInactiveColorKey, inactive_color);
+    window->SetProperty(chromeos::kFrameActiveColorKey, active_color);
+    window->SetProperty(chromeos::kFrameInactiveColorKey, inactive_color);
   }
 }
 

components/exo/shell_surface_base.cc

@@ -633,9 +633,9 @@ void ShellSurfaceBase::OnSetFrameColors(SkColor active_color,
   active_frame_color_ = SkColorSetA(active_color, SK_AlphaOPAQUE);
   inactive_frame_color_ = SkColorSetA(inactive_color, SK_AlphaOPAQUE);
   if (widget_) {
-    widget_->GetNativeWindow()->SetProperty(ash::kFrameActiveColorKey,
+    widget_->GetNativeWindow()->SetProperty(chromeos::kFrameActiveColorKey,
                                             active_frame_color_);
-    widget_->GetNativeWindow()->SetProperty(ash::kFrameInactiveColorKey,
+    widget_->GetNativeWindow()->SetProperty(chromeos::kFrameInactiveColorKey,
                                             inactive_frame_color_);
   }
 }