Refactored GlassBrowserFrameView and BrowserDesktopTreeHostWin.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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_GLASS_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/win/scoped_gdi_object.h"
@@ skipping 34 matching lines @@
   void Layout() override;
 
   // BrowserNonClientFrameView:
   void UpdateAvatar() override;
 
  private:
   // views::NonClientFrameView:
   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.
+  // Returns the thickness of the border around the client area (web content,
+  // toolbar, and tabs) that separates it from the frame border. 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 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 window border for the top edge of the frame,
+  // which is sometimes different than FrameBorderThickness(). 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 FrameTopBorderThickness(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 top chrome, from the edge of the window to
+  // the top of the tabs. If |restored| is true, this is calculated as if the

[Peter Kasting, 2016/04/19 21:00:00]

Nit: Maybe "Returns the height of everything above the tabstrip's hit-test
region, including both the window border (i.e. FrameTopBorderThickness()) and
any additional draggable area that's considered part of the window frame rather
than the tabstrip. ..."

[Bret, 2016/04/19 23:19:47]

Ok, I like your comment. Done.

+  // window was restored, regardless of its current state.
+  int TopAreaHeight(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 y coordinate for the Windows caption buttons.
+  int CaptionButtonY() const;
 
   // Returns whether the toolbar is currently visible.
   bool IsToolbarVisible() const;
 
+  // Returns whether the caption buttons are drawn at the leading edge (i.e. the
+  // left in LTR mode, or the right in RTL mode).
+  bool CaptionButtonsOnLeadingEdge() const;
+
   // Paint various sub-components of this view.
   void PaintToolbarBackground(gfx::Canvas* canvas) const;
   void PaintClientEdge(gfx::Canvas* canvas) const;
   void FillClientEdgeRects(int x,
                            int y,
                            int right,
                            int bottom,
                            SkColor color,
                            gfx::Canvas* canvas) const;
 
   // 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
   // calculated as if the window was restored, regardless of its current state.
   gfx::Insets GetClientAreaInsets(bool restored) const;
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds() const;
 
   // Starts/Stops the window throbber running.
   void StartThrobber();
   void StopThrobber();
 
   // Displays the next throbber frame.
   void DisplayNextThrobberFrame();
 
   // The layout rect of the incognito icon, if visible.
   gfx::Rect incognito_bounds_;
 
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;
 
   // The small icon created from the bitmap image of the window icon.
   base::win::ScopedHICON small_window_icon_;
 
   // 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.
   bool throbber_running_;
 
   // The index of the current frame of the throbber animation.
   int throbber_frame_;
 
   static const int kThrobberIconCount = 24;
   static HICON throbber_icons_[kThrobberIconCount];
   static void InitThrobberIcons();
 
   DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_