chrome/browser/ui/views/toolbar/reload_button_unittest.cc - Issue 101573006: Changes MouseEvent constructor to take changed_button_flags.

Unified Diff: chrome/browser/ui/views/toolbar/reload_button_unittest.cc

Issue 101573006: Changes MouseEvent constructor to take changed_button_flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test; needs updated expectations as mouse entered wasnt sent before because of env::mouse_butto… Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc ('k') | content/browser/renderer_host/input/synthetic_gesture_target_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/reload_button_unittest.cc

diff --git a/chrome/browser/ui/views/toolbar/reload_button_unittest.cc b/chrome/browser/ui/views/toolbar/reload_button_unittest.cc

index 5adaf1d588880d24a166a558b9c8b69a4a678da7..6d8e2571c62466a09ef97d702ba15d4a003ceddf 100644

--- a/chrome/browser/ui/views/toolbar/reload_button_unittest.cc

+++ b/chrome/browser/ui/views/toolbar/reload_button_unittest.cc

@@ -57,7 +57,7 @@ TEST_F(ReloadButtonTest, Basic) {

false);

// Press the button. This should start the double-click timer.

- ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0);

+ ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0, 0);

reload_.ButtonPressed(&reload_, e);

CheckState(true, ReloadButton::MODE_RELOAD, ReloadButton::MODE_RELOAD, true,

false);

@@ -76,7 +76,7 @@ TEST_F(ReloadButtonTest, Basic) {

TEST_F(ReloadButtonTest, DoubleClickTimer) {

// Start by pressing the button.

- ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0);

+ ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0, 0);

reload_.ButtonPressed(&reload_, e);

// Try to press the button again. This should do nothing because the timer is

@@ -102,7 +102,7 @@ TEST_F(ReloadButtonTest, DoubleClickTimer) {

TEST_F(ReloadButtonTest, DisableOnHover) {

// Change to stop and hover.

- ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0);

+ ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0, 0);

reload_.ButtonPressed(&reload_, e);

reload_.ChangeMode(ReloadButton::MODE_STOP, false);

set_mouse_hovered(true);

@@ -115,7 +115,7 @@ TEST_F(ReloadButtonTest, DisableOnHover) {

// Un-hover the button, which should allow it to reset.

set_mouse_hovered(false);

- ui::MouseEvent e2(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), 0);

+ ui::MouseEvent e2(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), 0, 0);

reload_.OnMouseExited(e2);

CheckState(true, ReloadButton::MODE_RELOAD, ReloadButton::MODE_RELOAD, false,

false);

@@ -123,7 +123,7 @@ TEST_F(ReloadButtonTest, DisableOnHover) {

TEST_F(ReloadButtonTest, ResetOnClick) {

// Change to stop and hover.

- ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0);

+ ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0, 0);

reload_.ButtonPressed(&reload_, e);

reload_.ChangeMode(ReloadButton::MODE_STOP, false);

set_mouse_hovered(true);

@@ -137,7 +137,7 @@ TEST_F(ReloadButtonTest, ResetOnClick) {

TEST_F(ReloadButtonTest, ResetOnTimer) {

// Change to stop, hover, and change back to reload.

- ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0);

+ ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0, 0);

reload_.ButtonPressed(&reload_, e);

reload_.ChangeMode(ReloadButton::MODE_STOP, false);

set_mouse_hovered(true);