Reland Linux Window Control Alignment

ash/wm/system_gesture_event_filter_unittest.cc

Index: ash/wm/system_gesture_event_filter_unittest.cc
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index 47f46df786dea4a5c59ad3e38383b88b096fcf73..02da758e8da5035425881301793e3d1c5a12f999 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/system_gesture_event_filter.h"
 
+#include <vector>
+
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ -36,6 +38,7 @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "ui/views/window/window_button_order_provider.h"
 
 namespace ash {
 namespace test {
@@ -136,6 +139,14 @@ class SystemGestureEventFilterTest
 
   // Overridden from AshTestBase:
   virtual void SetUp() OVERRIDE {
+    std::vector<views::FrameButton> leading;
+    std::vector<views::FrameButton> trailing;
+    trailing.push_back(views::FRAME_BUTTON_MINIMIZE);
+    trailing.push_back(views::FRAME_BUTTON_MAXIMIZE);
+    trailing.push_back(views::FRAME_BUTTON_CLOSE);
+    views::WindowButtonOrderProvider::GetInstance()->
+        SetWindowButtonOrder(leading, trailing);

[oshima, 2014/05/15 22:51:02]

can you explain why we want to do this?

[jonross, 2014/05/16 18:59:48]

Done.

+
     if (!docked_enabled_) {
       CommandLine::ForCurrentProcess()->AppendSwitch(
           ash::switches::kAshDisableDockedWindows);
@@ -435,7 +446,7 @@ TEST_P(SystemGestureEventFilterTest,
 }
 
 TEST_P(SystemGestureEventFilterTest, TwoFingerDragDelayed) {
-  gfx::Rect bounds(0, 0, 100, 100);
+  gfx::Rect bounds(0, 0, 200, 100);
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   views::Widget* toplevel = views::Widget::CreateWindowWithContextAndBounds(
       new ResizableWidgetDelegate, root_window, bounds);
@@ -470,7 +481,7 @@ TEST_P(SystemGestureEventFilterTest, TwoFingerDragDelayed) {
 }
 
 TEST_P(SystemGestureEventFilterTest, ThreeFingerGestureStopsDrag) {
-  gfx::Rect bounds(0, 0, 100, 100);
+  gfx::Rect bounds(0, 0, 200, 100);
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   views::Widget* toplevel = views::Widget::CreateWindowWithContextAndBounds(
       new ResizableWidgetDelegate, root_window, bounds);