Linux Aura Task Manager Frame Buttons Misaligned

ui/views/window/custom_frame_view.h

Index: ui/views/window/custom_frame_view.h
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index 96dbd225c19307a819ce6b140318f39a13b83f4b..3def1c619da966c7b5f81f819ac8d8da4584c5a1 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_view.h
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/window/frame_buttons.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace gfx {
@@ -29,15 +30,15 @@ class Widget;
 //  rendering the non-standard window caption, border, and controls.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class CustomFrameView : public NonClientFrameView,
-                        public ButtonListener {
+class VIEWS_EXPORT CustomFrameView : public NonClientFrameView,
+                                     public ButtonListener {
  public:
   CustomFrameView();
   virtual ~CustomFrameView();
 
   void Init(Widget* frame);
 
-  // Overridden from NonClientFrameView:
+  // NonClientFrameView:

[Elliot Glaysher, 2014/05/08 19:23:40]

Please don't remove the "Overridden from"; the majority of our code has this and
it should be kept for consistency.

[jonross, 2014/05/08 19:29:56]

I had been told that "Overridden from" was the older style. And had been asked
on previous reviews to update any instances in files I touched.

I can revert those changes here if desired.

[varkha, 2014/05/08 19:32:49]

FWIW I was also told that this was outdated in some previous reviews.

   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const OVERRIDE;
@@ -48,17 +49,19 @@ class CustomFrameView : public NonClientFrameView,
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
 
-  // Overridden from View:
+  // View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
   virtual gfx::Size GetMaximumSize() OVERRIDE;
 
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
  private:
+  friend class CustomFrameViewTest;
+
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.
   int FrameBorderThickness() const;
@@ -104,8 +107,14 @@ class CustomFrameView : public NonClientFrameView,
   SkColor GetFrameColor() const;
   const gfx::ImageSkia* GetFrameImage() const;
 
-  // Layout various sub-components of this view.
+  // Performs the layout for the window control buttons based on the
+  // configuration specified in |leading_buttons_| and |trailing_buttons_|.
+  // The sizing and positions of the buttons affects LayoutTitleBar, call
+  // this beforehand.
   void LayoutWindowControls();
+
+  // Calculations depend on the positions of the window controls. Always call
+  // LayoutWindowControls beforehand.
   void LayoutTitleBar();
   void LayoutClientView();
 
@@ -116,6 +125,10 @@ class CustomFrameView : public NonClientFrameView,
                                        int hot_image_id,
                                        int pushed_image_id);
 
+  // Returns the window caption button for the given FrameButton type, if it
+  // should be visible. Otherwise NULL.
+  ImageButton* GetImageButton(views::FrameButton button);
+
   // The bounds of the client view, in this view's coordinates.
   gfx::Rect client_view_bounds_;
 
@@ -140,6 +153,11 @@ class CustomFrameView : public NonClientFrameView,
   // Background painter for the window frame.
   scoped_ptr<FrameBackground> frame_background_;
 
+  // The horizontal boundaries for the title bar to layout within. Restricted
+  // by the space used by the leading and trailing buttons.
+  int minimum_title_bar_x_;
+  int maximum_title_bar_x_;
+
   DISALLOW_COPY_AND_ASSIGN(CustomFrameView);
 };