Rename BrowserFrameHeaderAsh with a `ChromeOS` suffix

The class will be used by BrowserNonClientFrameViewAsh, in
both ChromeOS and Lacros builds.

CL also migrates BrowserFrameHeaderAsh away from using ash::TabletMode,
in favor of chromeos::TabletState.

For more details, see phase 2.12 in [1].

[1] https://docs.google.com/document/d/1xHwcHrAiEaWuA4usGEqKZ9zm1H8SGk3WkS-Jf2Q_los/

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

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

chrome/browser/ui/BUILD.gn

@@ -2079,8 +2079,8 @@ static_library("ui") {
       "views/extensions/request_file_system_dialog_view.h",
       "views/frame/browser_frame_ash.cc",
       "views/frame/browser_frame_ash.h",
-      "views/frame/browser_frame_header_ash.cc",
-      "views/frame/browser_frame_header_ash.h",
+      "views/frame/browser_frame_header_chromeos.cc",
+      "views/frame/browser_frame_header_chromeos.h",
       "views/frame/browser_non_client_frame_view_ash.cc",
       "views/frame/browser_non_client_frame_view_ash.h",
       "views/frame/browser_non_client_frame_view_factory_chromeos.cc",

chrome/browser/ui/views/frame/browser_frame_header_ash.cc → chrome/browser/ui/views/frame/browser_frame_header_chromeos.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/frame/browser_frame_header_ash.h"
+#include "chrome/browser/ui/views/frame/browser_frame_header_chromeos.h"
 
-#include "ash/public/cpp/tablet_mode.h"
 #include "base/check.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chromeos/ui/base/chromeos_ui_constants.h"
+#include "chromeos/ui/base/tablet_state.h"
 #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"
@@ -106,9 +106,9 @@ void PaintFrameImagesInRoundRect(gfx::Canvas* canvas,
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameHeaderAsh, public:
+// BrowserFrameHeaderChromeOS, public:
 
-BrowserFrameHeaderAsh::BrowserFrameHeaderAsh(
+BrowserFrameHeaderChromeOS::BrowserFrameHeaderChromeOS(
     views::Widget* target_widget,
     views::View* view,
     AppearanceProvider* appearance_provider,
@@ -121,10 +121,10 @@ BrowserFrameHeaderAsh::BrowserFrameHeaderAsh(
   SetCaptionButtonContainer(caption_button_container);
 }
 
-BrowserFrameHeaderAsh::~BrowserFrameHeaderAsh() = default;
+BrowserFrameHeaderChromeOS::~BrowserFrameHeaderChromeOS() = default;
 
 // static
-int BrowserFrameHeaderAsh::GetThemeBackgroundXInset() {
+int BrowserFrameHeaderChromeOS::GetThemeBackgroundXInset() {
   // In the pre-Ash era the web content area had a frame along the left edge, so
   // user-generated theme images for the new tab page assume they are shifted
   // right relative to the header.  Now that we have removed the left edge frame
@@ -135,16 +135,17 @@ int BrowserFrameHeaderAsh::GetThemeBackgroundXInset() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameHeaderAsh, protected:
+// BrowserFrameHeaderChromeOS, protected:
 
-void BrowserFrameHeaderAsh::DoPaintHeader(gfx::Canvas* canvas) {
+void BrowserFrameHeaderChromeOS::DoPaintHeader(gfx::Canvas* canvas) {
   PaintFrameImages(canvas);
   PaintTitleBar(canvas);
 }
 
-views::CaptionButtonLayoutSize BrowserFrameHeaderAsh::GetButtonLayoutSize()
+views::CaptionButtonLayoutSize BrowserFrameHeaderChromeOS::GetButtonLayoutSize()
     const {
-  if (ash::TabletMode::Get() && ash::TabletMode::Get()->InTabletMode())
+  if (chromeos::TabletState::Get() &&
+      chromeos::TabletState::Get()->InTabletMode())
     return views::CaptionButtonLayoutSize::kBrowserCaptionMaximized;
 
   return chromeos::ShouldUseRestoreFrame(target_widget())
@@ -152,23 +153,23 @@ views::CaptionButtonLayoutSize BrowserFrameHeaderAsh::GetButtonLayoutSize()
              : views::CaptionButtonLayoutSize::kBrowserCaptionMaximized;
 }
 
-SkColor BrowserFrameHeaderAsh::GetTitleColor() const {
+SkColor BrowserFrameHeaderChromeOS::GetTitleColor() const {
   return appearance_provider_->GetTitleColor();
 }
 
-SkColor BrowserFrameHeaderAsh::GetCurrentFrameColor() const {
+SkColor BrowserFrameHeaderChromeOS::GetCurrentFrameColor() const {
   return appearance_provider_->GetFrameHeaderColor(mode() == MODE_ACTIVE);
 }
 
-void BrowserFrameHeaderAsh::UpdateFrameColors() {
+void BrowserFrameHeaderChromeOS::UpdateFrameColors() {
   UpdateCaptionButtonColors();
   view()->SchedulePaint();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameHeaderAsh, private:
+// BrowserFrameHeaderChromeOS, private:
 
-void BrowserFrameHeaderAsh::PaintFrameImages(gfx::Canvas* canvas) {
+void BrowserFrameHeaderChromeOS::PaintFrameImages(gfx::Canvas* canvas) {
   const bool active = mode() == Mode::MODE_ACTIVE;
 
   gfx::ImageSkia frame_image =

chrome/browser/ui/views/frame/browser_frame_header_ash.h → chrome/browser/ui/views/frame/browser_frame_header_chromeos.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_ASH_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_ASH_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_CHROMEOS_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_CHROMEOS_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -12,7 +12,7 @@
 
 // Helper class for drawing a custom frame (such as for a themed Chrome Browser
 // frame).
-class BrowserFrameHeaderAsh : public chromeos::FrameHeader {
+class BrowserFrameHeaderChromeOS : public chromeos::FrameHeader {
  public:
   class AppearanceProvider {
    public:
@@ -24,15 +24,15 @@ class BrowserFrameHeaderAsh : public chromeos::FrameHeader {
     virtual gfx::ImageSkia GetFrameHeaderOverlayImage(bool active) = 0;
   };
 
-  // BrowserFrameHeaderAsh does not take ownership of any of the parameters.
-  // |target_widget| is the widget that the caption buttons act on.
+  // BrowserFrameHeaderChromeOS does not take ownership of any of the
+  // parameters. |target_widget| is the widget that the caption buttons act on.
   // |view| is the view into which |this| will paint.
-  BrowserFrameHeaderAsh(
+  BrowserFrameHeaderChromeOS(
       views::Widget* target_widget,
       views::View* view,
       AppearanceProvider* appearance_provider,
       chromeos::FrameCaptionButtonContainerView* caption_button_container);
-  ~BrowserFrameHeaderAsh() override;
+  ~BrowserFrameHeaderChromeOS() override;
 
   // Returns the amount that the frame background is inset from the left edge of
   // the window.
@@ -54,7 +54,7 @@ class BrowserFrameHeaderAsh : public chromeos::FrameHeader {
 
   AppearanceProvider* appearance_provider_ = nullptr;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserFrameHeaderAsh);
+  DISALLOW_COPY_AND_ASSIGN(BrowserFrameHeaderChromeOS);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_ASH_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_CHROMEOS_H_

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

@@ -197,7 +197,7 @@ int BrowserNonClientFrameViewAsh::GetTopInset(bool restored) const {
 }
 
 int BrowserNonClientFrameViewAsh::GetThemeBackgroundXInset() const {
-  return BrowserFrameHeaderAsh::GetThemeBackgroundXInset();
+  return BrowserFrameHeaderChromeOS::GetThemeBackgroundXInset();
 }
 
 void BrowserNonClientFrameViewAsh::UpdateFrameColor() {
@@ -627,8 +627,8 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() {
   std::unique_ptr<chromeos::FrameHeader> header;
   Browser* browser = browser_view()->browser();
   if (!UsePackagedAppHeaderStyle(browser)) {
-    header = std::make_unique<BrowserFrameHeaderAsh>(frame(), this, this,
-                                                     caption_button_container_);
+    header = std::make_unique<BrowserFrameHeaderChromeOS>(
+        frame(), this, this, caption_button_container_);
   } else {
     header = std::make_unique<chromeos::DefaultFrameHeader>(
         frame(), this, caption_button_container_);

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

@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
-#include "chrome/browser/ui/views/frame/browser_frame_header_ash.h"
+#include "chrome/browser/ui/views/frame/browser_frame_header_chromeos.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/tab_icon_view_model.h"
@@ -34,7 +34,7 @@ class FrameCaptionButtonContainerView;
 // Provides the BrowserNonClientFrameView for Chrome OS.
 class BrowserNonClientFrameViewAsh
     : public BrowserNonClientFrameView,
-      public BrowserFrameHeaderAsh::AppearanceProvider,
+      public BrowserFrameHeaderChromeOS::AppearanceProvider,
       public display::DisplayObserver,
       public TabIconViewModel,
       public aura::WindowObserver,
@@ -75,7 +75,7 @@ class BrowserNonClientFrameViewAsh
   void OnThemeChanged() override;
   void ChildPreferredSizeChanged(views::View* child) override;
 
-  // BrowserFrameHeaderAsh::AppearanceProvider:
+  // BrowserFrameHeaderChromeOS::AppearanceProvider:
   SkColor GetTitleColor() override;
   SkColor GetFrameHeaderColor(bool active) override;
   gfx::ImageSkia GetFrameHeaderImage(bool active) override;