Revert "Move DefaultFrameHeader to //chromeos/ui/frame/"

This reverts commit 73e9db73.

Reason for revert: Likely culprit for linker error which closed tree. 
Sample failing build: https://ci.chromium.org/p/chromium/builders/ci/chromeos-amd64-generic-lacros-dbg/2634?

Original change's description:
> Move DefaultFrameHeader to //chromeos/ui/frame/
>
> This header/class is directly used by BrowserNonClientFrameViewAsh.
> This steps goes one step closed to allow this class to be shared
> with Lacros.
>
> BUG=1113900
> R=​jamescook@chromium.org, oshima@chromium.org
>
> Change-Id: I185560a34265e6ff13c48b48634faf6826f2236a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529570
> Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#825896}

TBR=jamescook@chromium.org,oshima@chromium.org,tonikitoo@igalia.com

Change-Id: I4fca1a562ad4f9b14937b4e96f73323799369f2b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1113900
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2530210Reviewed-by: Tommy Martino <tmartino@chromium.org>
Commit-Queue: Tommy Martino <tmartino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825912}

ash/frame/default_frame_header_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/ui/frame/default_frame_header.h"
+#include "ash/public/cpp/default_frame_header.h"
 
 #include <memory>
 
@@ -25,7 +25,6 @@
 #include "ui/views/window/non_client_view.h"
 #include "ui/wm/core/window_util.h"
 
-using chromeos::DefaultFrameHeader;
 using chromeos::FrameBackButton;
 using chromeos::FrameCaptionButtonContainerView;
 using chromeos::FrameHeader;

ash/frame/header_view.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/shell.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "ash/wm/window_state.h"
@@ -14,7 +15,6 @@
 #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"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/views/controls/image_view.h"
@@ -24,7 +24,6 @@
 
 namespace ash {
 
-using ::chromeos::DefaultFrameHeader;
 using ::chromeos::kFrameActiveColorKey;
 using ::chromeos::kFrameInactiveColorKey;
 

ash/frame/header_view.h

@@ -21,7 +21,6 @@
 #include "ui/views/view.h"
 
 namespace chromeos {
-class DefaultFrameHeader;
 class FrameCaptionButtonContainerView;
 }
 
@@ -38,6 +37,7 @@ class NonClientFrameView;
 
 namespace ash {
 
+class DefaultFrameHeader;
 enum class FrameBackButtonState;
 
 // View which paints the frame header (title, caption buttons...). It slides off
@@ -124,7 +124,7 @@ class ASH_EXPORT HeaderView
   std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
   void Relayout() override;
 
-  chromeos::DefaultFrameHeader* GetFrameHeader() { return frame_header_.get(); }
+  DefaultFrameHeader* GetFrameHeader() { return frame_header_.get(); }
 
  private:
   class HeaderContentView;
@@ -147,7 +147,7 @@ class ASH_EXPORT HeaderView
   // CustomFrameHeader which is aware of theming. In classic Ash, Chrome Browser
   // windows won't use HeaderView at all. In either configuration, non Browser
   // windows will use DefaultFrameHeader.
-  std::unique_ptr<chromeos::DefaultFrameHeader> frame_header_;
+  std::unique_ptr<DefaultFrameHeader> frame_header_;
 
   views::ImageView* avatar_icon_ = nullptr;
 

ash/frame/non_client_frame_view_ash.cc

@@ -10,6 +10,7 @@
 
 #include "ash/frame/header_view.h"
 #include "ash/public/cpp/ash_constants.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/public/cpp/tablet_mode_observer.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
@@ -22,7 +23,6 @@
 #include "base/bind.h"
 #include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "chromeos/ui/frame/frame_utils.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
 #include "ui/aura/client/aura_constants.h"

ash/frame/non_client_frame_view_ash_unittest.cc

@@ -10,6 +10,7 @@
 #include "ash/frame/header_view.h"
 #include "ash/frame/wide_frame_view.h"
 #include "ash/public/cpp/ash_switches.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -24,7 +25,6 @@
 #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/default_frame_header.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller_test_api.h"
 #include "chromeos/ui/vector_icons/vector_icons.h"
@@ -49,7 +49,6 @@
 
 namespace ash {
 
-using ::chromeos::DefaultFrameHeader;
 using ::chromeos::FrameCaptionButtonContainerView;
 using ::chromeos::ImmersiveFullscreenController;
 using ::chromeos::ImmersiveFullscreenControllerDelegate;

ash/frame/wide_frame_view.cc

@@ -6,6 +6,7 @@
 
 #include "ash/frame/header_view.h"
 #include "ash/frame/non_client_frame_view_ash.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
 #include "ash/wm/overview/overview_controller.h"
@@ -13,7 +14,6 @@
 #include "ash/wm/wm_event.h"
 #include "base/metrics/user_metrics.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_targeter.h"

ash/public/cpp/BUILD.gn

@@ -112,6 +112,8 @@ component("cpp") {
     "clipboard_history_controller.h",
     "clipboard_image_model_factory.cc",
     "clipboard_image_model_factory.h",
+    "default_frame_header.cc",
+    "default_frame_header.h",
     "default_scale_factor_retriever.cc",
     "default_scale_factor_retriever.h",
     "desks_helper.cc",

chromeos/ui/frame/default_frame_header.cc → ash/public/cpp/default_frame_header.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/ui/frame/default_frame_header.h"
+#include "ash/public/cpp/default_frame_header.h"
 
 #include "base/logging.h"  // DCHECK
 #include "chromeos/ui/base/chromeos_ui_constants.h"
@@ -21,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 {
@@ -55,7 +57,7 @@ void TileRoundRect(gfx::Canvas* canvas,
 
 }  // namespace
 
-namespace chromeos {
+namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultFrameHeader, public:
@@ -164,4 +166,4 @@ SkColor DefaultFrameHeader::GetActiveFrameColorForPaintForTest() {
   return active_frame_color_;
 }
 
-}  // namespace chromeos
+}  // namespace ash

chromeos/ui/frame/default_frame_header.h → ash/public/cpp/default_frame_header.h

@@ -2,28 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_UI_FRAME_DEFAULT_FRAME_HEADER_H_
-#define CHROMEOS_UI_FRAME_DEFAULT_FRAME_HEADER_H_
+#ifndef ASH_PUBLIC_CPP_DEFAULT_FRAME_HEADER_H_
+#define ASH_PUBLIC_CPP_DEFAULT_FRAME_HEADER_H_
 
 #include <memory>
 
+#include "ash/public/cpp/ash_public_export.h"
 #include "base/compiler_specific.h"  // override
-#include "base/component_export.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "chromeos/ui/frame/frame_header.h"
 
 namespace ash {
-FORWARD_DECLARE_TEST(DefaultFrameHeaderTest, FrameColors);
-}  // namespace ash
-
-namespace chromeos {
 
 // Helper class for managing the default window header, which is used for
 // Chrome apps (but not bookmark apps), for example.
-class COMPONENT_EXPORT(CHROMEOS_UI_FRAME) DefaultFrameHeader
-    : public FrameHeader {
+class ASH_PUBLIC_EXPORT DefaultFrameHeader : public chromeos::FrameHeader {
  public:
   // DefaultFrameHeader does not take ownership of any of the parameters.
   DefaultFrameHeader(
@@ -48,7 +43,7 @@ class COMPONENT_EXPORT(CHROMEOS_UI_FRAME) DefaultFrameHeader
   SkColor GetCurrentFrameColor() const override;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ash::DefaultFrameHeaderTest, FrameColors);
+  FRIEND_TEST_ALL_PREFIXES(DefaultFrameHeaderTest, FrameColors);
 
   // Returns the window of the target widget.
   aura::Window* GetTargetWindow();
@@ -63,6 +58,6 @@ class COMPONENT_EXPORT(CHROMEOS_UI_FRAME) DefaultFrameHeader
   DISALLOW_COPY_AND_ASSIGN(DefaultFrameHeader);
 };
 
-}  // namespace chromeos
+}  // namespace ash
 
-#endif  // CHROMEOS_UI_FRAME_DEFAULT_FRAME_HEADER_H_
+#endif  // ASH_PUBLIC_CPP_DEFAULT_FRAME_HEADER_H_

chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc

@@ -21,6 +21,7 @@
 #include "ash/public/cpp/autotest_ambient_api.h"
 #include "ash/public/cpp/autotest_desks_api.h"
 #include "ash/public/cpp/autotest_private_api_utils.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/public/cpp/desks_helper.h"
 #include "ash/public/cpp/login_screen.h"
 #include "ash/public/cpp/metrics_util.h"
@@ -121,7 +122,6 @@
 #include "chromeos/services/machine_learning/public/cpp/service_connection.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/ui/base/window_properties.h"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "chromeos/ui/frame/frame_header.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
 #include "components/arc/arc_prefs.h"

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

@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "ash/public/cpp/app_types.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/metrics/user_metrics.h"
@@ -38,7 +39,6 @@
 #include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/base/window_state_type.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "chromeos/ui/frame/frame_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -630,7 +630,7 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() {
     header = std::make_unique<BrowserFrameHeaderAsh>(frame(), this, this,
                                                      caption_button_container_);
   } else {
-    header = std::make_unique<chromeos::DefaultFrameHeader>(
+    header = std::make_unique<ash::DefaultFrameHeader>(
         frame(), this, caption_button_container_);
   }
 

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

@@ -5,6 +5,7 @@
 #include <string>
 
 #include "ash/public/cpp/ash_switches.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/public/cpp/shelf_test_api.h"
 #include "ash/public/cpp/split_view_test_api.h"
 #include "ash/public/cpp/test/shell_test_api.h"
@@ -72,7 +73,6 @@
 #include "chromeos/ui/base/window_pin_type.h"
 #include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "chromeos/ui/frame/frame_header.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller_test_api.h"
 #include "components/account_id/account_id.h"
@@ -831,7 +831,7 @@ class WebAppNonClientFrameViewAshTest
 
   Browser* app_browser_ = nullptr;
   BrowserView* browser_view_ = nullptr;
-  chromeos::DefaultFrameHeader* frame_header_ = nullptr;
+  ash::DefaultFrameHeader* frame_header_ = nullptr;
   WebAppFrameToolbarView* web_app_frame_toolbar_ = nullptr;
   const std::vector<ContentSettingImageView*>* content_setting_views_ = nullptr;
   BrowserActionsContainer* browser_actions_container_ = nullptr;
@@ -886,8 +886,8 @@ class WebAppNonClientFrameViewAshTest
 
     browser_view_ = BrowserView::GetBrowserViewForBrowser(app_browser_);
     BrowserNonClientFrameViewAsh* frame_view = GetFrameViewAsh(browser_view_);
-    frame_header_ = static_cast<chromeos::DefaultFrameHeader*>(
-        frame_view->frame_header_.get());
+    frame_header_ =
+        static_cast<ash::DefaultFrameHeader*>(frame_view->frame_header_.get());
 
     web_app_frame_toolbar_ = frame_view->web_app_frame_toolbar_for_testing();
     DCHECK(web_app_frame_toolbar_);

chromeos/ui/frame/BUILD.gn

@@ -22,8 +22,6 @@ source_set("frame") {
     "caption_buttons/frame_size_button_delegate.h",
     "caption_buttons/snap_controller.cc",
     "caption_buttons/snap_controller.h",
-    "default_frame_header.cc",
-    "default_frame_header.h",
     "frame_header.cc",
     "frame_header.h",
     "frame_utils.cc",

components/exo/DEPS

@@ -5,7 +5,8 @@ include_rules = [
   "+chromeos/constants/chromeos_features.h",
   "+chromeos/crosapi/cpp/crosapi_constants.h",
   "+chromeos/ui/base",
-  "+chromeos/ui/frame",
+  "+chromeos/ui/frame/caption_buttons",
+  "+chromeos/ui/frame/immersive",
   "+components/viz/common",
   "+components/viz/host",
   "+device/gamepad",

components/exo/client_controlled_shell_surface.cc

@@ -11,6 +11,7 @@
 #include "ash/frame/non_client_frame_view_ash.h"
 #include "ash/frame/wide_frame_view.h"
 #include "ash/public/cpp/ash_features.h"
+#include "ash/public/cpp/default_frame_header.h"
 #include "ash/public/cpp/rounded_corner_decorator.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_backdrop.h"
@@ -39,7 +40,6 @@
 #include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/base/window_state_type.h"
 #include "chromeos/ui/frame/caption_buttons/caption_button_model.h"
-#include "chromeos/ui/frame/default_frame_header.h"
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
 #include "components/exo/shell_surface_util.h"
 #include "components/exo/surface.h"