Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/view_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 138 matching lines @@
 #endif
     last_clip_.setEmpty();
     accelerator_count_map_.clear();
   }
 
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual void ViewHierarchyChanged(
       bool is_add, View *parent, View *child) OVERRIDE;
   virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
-  virtual void OnMouseReleased(const MouseEvent& event, bool canceled) OVERRIDE;
+  virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
 #if defined(TOUCH_UI)
   virtual TouchStatus OnTouchEvent(const TouchEvent& event);
 #endif
   virtual void Paint(gfx::Canvas* canvas) OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
   virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;
 
   // OnBoundsChanged test
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
@@ skipping 179 matching lines @@
   location_.SetPoint(event.x(), event.y());
   return true;
 }
 
 bool TestView::OnMouseDragged(const MouseEvent& event) {
   last_mouse_event_type_ = event.type();
   location_.SetPoint(event.x(), event.y());
   return true;
 }
 
-void TestView::OnMouseReleased(const MouseEvent& event, bool canceled) {
+void TestView::OnMouseReleased(const MouseEvent& event) {
   last_mouse_event_type_ = event.type();
   location_.SetPoint(event.x(), event.y());
 }
 
 TEST_F(ViewTest, MouseEvent) {
   TestView* v1 = new TestView();
   v1->SetBounds(0, 0, 300, 300);
 
   TestView* v2 = new TestView();
   v2->SetBounds(100, 100, 100, 100);
@@ skipping 1099 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ButtonDropDownTest);
 };
 
 // Ensure that regular clicks on the drop down button still work. (i.e. - the
 // click events are processed and the listener gets the click)
 TEST_F(ButtonDropDownTest, RegularClickTest) {
   MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN);
   MouseEvent release_event(ui::ET_MOUSE_RELEASED, 1, 1,
                            ui::EF_LEFT_BUTTON_DOWN);
   button_as_view_->OnMousePressed(press_event);
-  button_as_view_->OnMouseReleased(release_event, false);
+  button_as_view_->OnMouseReleased(release_event);
   EXPECT_EQ(test_dialog_->last_pressed_button_, test_dialog_->button_drop_);
 }
 
 #if defined(OS_WIN)
 // Ensure that dragging downwards on the button shows the menu while keeping the
 // button depressed.
 TEST_F(ButtonDropDownTest, DragMenuTest) {
   test_dialog_->last_pressed_button_ = NULL;
   MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN);
   MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, 1, 99, ui::EF_LEFT_BUTTON_DOWN);
@@ skipping 254 matching lines @@
   MouseEvent pressed(ui::ET_MOUSE_PRESSED,
                      110, 210,
                      ui::EF_LEFT_BUTTON_DOWN);
   root->OnMousePressed(pressed);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
   EXPECT_EQ(190, v2->location_.x());
   EXPECT_EQ(10, v2->location_.y());
 
   MouseEvent released(ui::ET_MOUSE_RELEASED, 0, 0, 0);
-  root->OnMouseReleased(released, false);
+  root->OnMouseReleased(released);
 
   // Now rotate |v2| inside |v1| clockwise.
   v2->SetRotation(90.0);
   v2->SetTranslateX(100);
 
   // Now, |v2| occupies (100, 100) to (200, 300) in |v1|, and (100, 300) to
   // (300, 400) in |root|.
 
   v1->Reset();
   v2->Reset();
 
   MouseEvent p2(ui::ET_MOUSE_PRESSED,
                 110, 320,
                 ui::EF_LEFT_BUTTON_DOWN);
   root->OnMousePressed(p2);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
   EXPECT_EQ(10, v2->location_.x());
   EXPECT_EQ(20, v2->location_.y());
 
-  root->OnMouseReleased(released, false);
+  root->OnMouseReleased(released);
 
   v1->ResetTransform();
   v2->ResetTransform();
 
   TestView* v3 = new TestView();
   v3->SetBounds(10, 10, 20, 30);
   v2->AddChildView(v3);
 
   // Rotate |v3| clockwise with respect to |v2|.
   v3->SetRotation(90.0);
@@ skipping 10 matching lines @@
 
   MouseEvent p3(ui::ET_MOUSE_PRESSED,
                 112, 110,
                 ui::EF_LEFT_BUTTON_DOWN);
   root->OnMousePressed(p3);
 
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
   EXPECT_EQ(10, v3->location_.x());
   EXPECT_EQ(25, v3->location_.y());
 
-  root->OnMouseReleased(released, false);
+  root->OnMouseReleased(released);
 
   v1->ResetTransform();
   v2->ResetTransform();
   v3->ResetTransform();
 
   v1->Reset();
   v2->Reset();
   v3->Reset();
 
   // Rotate |v3| clockwise with respect to |v2|, and scale it along both axis.
@@ skipping 11 matching lines @@
 
   MouseEvent p4(ui::ET_MOUSE_PRESSED,
                 124, 125,
                 ui::EF_LEFT_BUTTON_DOWN);
   root->OnMousePressed(p4);
 
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
   EXPECT_EQ(10, v3->location_.x());
   EXPECT_EQ(25, v3->location_.y());
 
-  root->OnMouseReleased(released, false);
+  root->OnMouseReleased(released);
 
   widget->CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OnVisibleBoundsChanged()
 
 class VisibleBoundsView : public View {
  public:
   VisibleBoundsView() : received_notification_(false) {}
@@ skipping 82 matching lines @@
   top_view->scheduled_paint_rects_.clear();
   child_view->SetBounds(30, 30, 20, 20);
   EXPECT_EQ(2U, top_view->scheduled_paint_rects_.size());
 
   // There should be 2 rects, spanning from (10, 10) to (50, 50).
   gfx::Rect paint_rect =
       top_view->scheduled_paint_rects_[0].Union(
           top_view->scheduled_paint_rects_[1]);
   EXPECT_EQ(gfx::Rect(10, 10, 40, 40), paint_rect);
 }