Revert of Prevents double-clicks on a tab close button from aslo maximizing the browser

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 2013 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.
 
 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/client/aura_constants.cc"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/base/hit_test.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
-namespace {
-
-// Class which allows for the designation of non-client component targets of
-// hit tests.
-class TestDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
- public:
-  explicit TestDesktopNativeWidgetAura(
-      views::internal::NativeWidgetDelegate* delegate)
-      : views::DesktopNativeWidgetAura(delegate) {}
-  virtual ~TestDesktopNativeWidgetAura() {}
-
-  void set_window_component(int window_component) {
-    window_component_ = window_component;
-  }
-
-  // DesktopNativeWidgetAura:
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
-    return window_component_;
-  }
-
- private:
-  int window_component_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestDesktopNativeWidgetAura);
-};
-
-}  // namespace
-
 namespace views {
 
 const int64 kFirstDisplay = 5321829;
 const int64 kSecondDisplay = 928310;
 
 // Class which waits till the X11 window associated with the widget passed into
 // the constructor is activated. We cannot listen for the widget's activation
 // because the _NET_ACTIVE_WINDOW property is changed after the widget is
 // activated.
 class ActivationWaiter : public ui::PlatformEventDispatcher {
@@ skipping 84 matching lines @@
   std::vector<gfx::Display> removed_display_;
 
   DesktopScreenX11* screen() { return screen_.get(); }
 
   void ResetDisplayChanges() {
     changed_display_.clear();
     added_display_.clear();
     removed_display_.clear();
   }
 
-  Widget* BuildTopLevelDesktopWidget(const gfx::Rect& bounds,
-      bool use_test_native_widget) {
+  Widget* BuildTopLevelDesktopWidget(const gfx::Rect& bounds) {
     Widget* toplevel = new Widget;
     Widget::InitParams toplevel_params =
         CreateParams(Widget::InitParams::TYPE_WINDOW);
-    if (use_test_native_widget) {
-      toplevel_params.native_widget =
-          new TestDesktopNativeWidgetAura(toplevel);
-    } else {
-      toplevel_params.native_widget =
-          new views::DesktopNativeWidgetAura(toplevel);
-    }
+    toplevel_params.native_widget =
+        new views::DesktopNativeWidgetAura(toplevel);
     toplevel_params.bounds = bounds;
     toplevel_params.remove_standard_frame = true;
     toplevel->Init(toplevel_params);
     return toplevel;
   }
 
  private:
   // Overridden from gfx::DisplayObserver:
   virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE {
     changed_display_.push_back(display);
@@ skipping 124 matching lines @@
                                   gfx::Rect(640, 0, 1024, 768)));
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 640, 480)));
   screen()->ProcessDisplayChange(displays);
 
   // The first display in the list is always the primary, even if other
   // displays are to the left in screen layout.
   EXPECT_EQ(kFirstDisplay, screen()->GetPrimaryDisplay().id());
 }
 
 TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
-  Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(110, 110, 10, 10),
-      false);
-  Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(150, 150, 10, 10),
-      false);
+  Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(110, 110, 10, 10));
+  Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(150, 150, 10, 10));
   Widget* window_three =
-      BuildTopLevelDesktopWidget(gfx::Rect(115, 115, 20, 20), false);
+      BuildTopLevelDesktopWidget(gfx::Rect(115, 115, 20, 20));
 
   window_three->Show();
   window_two->Show();
   window_one->Show();
 
   // Make sure the internal state of DesktopWindowTreeHostX11 is set up
   // correctly.
   ASSERT_EQ(3u, DesktopWindowTreeHostX11::GetAllOpenWindows().size());
 
   EXPECT_EQ(window_one->GetNativeWindow(),
@@ skipping 18 matching lines @@
 }
 
 TEST_F(DesktopScreenX11Test, GetDisplayNearestWindow) {
   // Set up a two monitor situation.
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
   screen()->ProcessDisplayChange(displays);
 
-  Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10),
-      false);
-  Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(650, 50, 10, 10),
-      false);
+  Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10));
+  Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(650, 50, 10, 10));
 
   EXPECT_EQ(
       kFirstDisplay,
       screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
   EXPECT_EQ(
       kSecondDisplay,
       screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id());
 
   window_one->CloseNow();
   window_two->CloseNow();
 }
 
-// Tests that the window is maximized in response to a double click event.
-TEST_F(DesktopScreenX11Test, DoubleClickHeaderMaximizes) {
-  Widget* widget = BuildTopLevelDesktopWidget(gfx::Rect(0, 0, 100, 100), true);
-  widget->Show();
-  TestDesktopNativeWidgetAura* native_widget =
-      static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
-  native_widget->set_window_component(HTCAPTION);
-
-  aura::Window* window = widget->GetNativeWindow();
-  window->SetProperty(aura::client::kCanMaximizeKey, true);
-
-  // Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
-  DesktopWindowTreeHost* rwh =
-      DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
-          GetAcceleratedWidget());
-
-  aura::test::EventGenerator generator(window);
-  generator.ClickLeftButton();
-  generator.DoubleClickLeftButton();
-  RunPendingMessages();
-  EXPECT_TRUE(rwh->IsMaximized());
-
-  widget->CloseNow();
-}
-
-// Tests that the window does not maximize in response to a double click event,
-// if the first click was to a different target component than that of the
-// second click.
-TEST_F(DesktopScreenX11Test, DoubleClickTwoDifferentTargetsDoesntMaximizes) {
-  Widget* widget = BuildTopLevelDesktopWidget(gfx::Rect(0, 0, 100, 100), true);
-  widget->Show();
-  TestDesktopNativeWidgetAura* native_widget =
-      static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
-
-  aura::Window* window = widget->GetNativeWindow();
-  window->SetProperty(aura::client::kCanMaximizeKey, true);
-
-  // Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
-  DesktopWindowTreeHost* rwh =
-      DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
-          GetAcceleratedWidget());
-
-  aura::test::EventGenerator generator(window);
-  native_widget->set_window_component(HTCLIENT);
-  generator.ClickLeftButton();
-  native_widget->set_window_component(HTCAPTION);
-  generator.DoubleClickLeftButton();
-  RunPendingMessages();
-  EXPECT_FALSE(rwh->IsMaximized());
-
-  widget->CloseNow();
-}
-
-// Tests that the window does not maximize in response to a double click event,
-// if the double click was interrupted by a right click.
-TEST_F(DesktopScreenX11Test, RightClickDuringDoubleClickDoesntMaximize) {
-  Widget* widget = BuildTopLevelDesktopWidget(gfx::Rect(0, 0, 100, 100), true);
-  widget->Show();
-  TestDesktopNativeWidgetAura* native_widget =
-      static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
-
-  aura::Window* window = widget->GetNativeWindow();
-  window->SetProperty(aura::client::kCanMaximizeKey, true);
-
-  // Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
-  DesktopWindowTreeHost* rwh = static_cast<DesktopWindowTreeHost*>(
-      DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
-          GetAcceleratedWidget()));
-
-  aura::test::EventGenerator generator(window);
-  native_widget->set_window_component(HTCLIENT);
-  generator.ClickLeftButton();
-  native_widget->set_window_component(HTCAPTION);
-  generator.PressRightButton();
-  generator.ReleaseRightButton();
-  EXPECT_FALSE(rwh->IsMaximized());
-  generator.DoubleClickLeftButton();
-  RunPendingMessages();
-  EXPECT_FALSE(rwh->IsMaximized());
-
-  widget->CloseNow();
-}
-
 }  // namespace views