Refactored GlassBrowserFrameView and BrowserDesktopTreeHostWin.

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

Index: chrome/browser/ui/views/frame/glass_browser_frame_view.h
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
index f14ba9dfa546e2920d12e20d0b89514ab10f6b7b..90ad26eba57236bc7c3f4c5227cc45c638cbf512 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
@@ -52,30 +52,37 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView {
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
-  // Returns the thickness of the border that makes up the window left, right,
-  // and bottom frame edges.  This does not include any client edge.
-  int FrameBorderThickness() const;
-
-  // Returns the height of the window top frame edge.  If |restored| is true,
-  // this is calculated as if the window was restored, regardless of its current
-  // state.
-  int FrameTopBorderHeight(bool restored) const;
-
-  // Returns the thickness of the entire nonclient left, right, and bottom
-  // borders, including both the window frame and any client edge. If |restored|
-  // is true, this is calculated as if the window was restored, regardless of
-  // its current state.
-  int NonClientBorderThickness(bool restored) const;
-
-  // Returns the height of the entire nonclient top border, including the window
-  // frame, any title area, and any connected client edge.  If |restored| is
-  // true, this is calculated as if the window was restored, regardless of its
-  // current state.
-  int NonClientTopBorderHeight(bool restored) const;
+  // Returns the thickness of the border around the client area that separates
+  // it from the non-client area. If |restored| is true, this is calculated as
+  // if the window was restored, regardless of its current state.
+  int ClientBorderThickness(bool restored) const;
+
+  // Returns the thickness of the window border for the left, right, and bottom
+  // edges of the frame. On Windows 10 this is a mostly-transparent handle that
+  // allows you to resize the window.
+  int NonClientBorderThickness() const;
+
+  // Returns the thickness of the window border for the top edge of the frame,
+  // which is sometimes different than NonClientBorderThickness(). Does not
+  // include the titlebar/tabstrip area. If |restored| is true, this is
+  // calculated as if the window was restored, regardless of its current state.
+  int NonClientTopBorderThickness(bool restored) const;
+
+  // Returns the height of the entire nonclient top border, from the edge of the
+  // window to the top of the tabs. If |restored| is true, this is calculated as
+  // if the window was restored, regardless of its current state.
+  int NonClientTopHeight(bool restored) const;
+
+  // Returns the y coordinate for the Windows caption buttons.
+  int CaptionButtonY() const;
 
   // Returns whether the toolbar is currently visible.
   bool IsToolbarVisible() const;
 
+  // Returns whether we're in RTL mode and the caption buttons are drawn at the
+  // top-right corner.
+  bool RTLModeAndCaptionButtonsOnRight() const;
+
   // Paint various sub-components of this view.
   void PaintToolbarBackground(gfx::Canvas* canvas) const;
   void PaintClientEdge(gfx::Canvas* canvas) const;
@@ -88,7 +95,7 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView {
 
   // Layout various sub-components of this view.
   void LayoutIncognitoIcon();
-  void LayoutNewStyleAvatar();
+  void LayoutProfileSwitcher();
   void LayoutClientView();
 
   // Returns the insets of the client area. If |restored| is true, this is
@@ -117,7 +124,7 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView {
   // The big icon created from the bitmap image of the window icon.
   base::win::ScopedHICON big_window_icon_;
 
-  // Wrapper around the in-frame avatar switcher.
+  // Wrapper around the in-frame profile switcher.
   AvatarButtonManager profile_switcher_;
 
   // Whether or not the window throbber is currently animating.