diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:28:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:28:06 +0000 |
| commit | e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c (patch) | |
| tree | 05402030dd11561f128734a8df6e2e6a848fc366 /chrome/browser/ui/views/location_bar | |
| parent | 6e472da04f540d7837b7a344383869013bc57a3d (diff) | |
| download | chromium_src-e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c.zip chromium_src-e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c.tar.gz chromium_src-e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c.tar.bz2 | |
Migrate Event API methods to Google Style.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6480001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/location_bar')
3 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 6634354..08188c6 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -697,13 +697,13 @@ void LocationBarView::SelectAll() { bool LocationBarView::OnMousePressed(const views::MouseEvent& event) { UINT msg; if (event.IsLeftMouseButton()) { - msg = (event.GetFlags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? + msg = (event.flags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? WM_LBUTTONDBLCLK : WM_LBUTTONDOWN; } else if (event.IsMiddleMouseButton()) { - msg = (event.GetFlags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? + msg = (event.flags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? WM_MBUTTONDBLCLK : WM_MBUTTONDOWN; } else if (event.IsRightMouseButton()) { - msg = (event.GetFlags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? + msg = (event.flags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? WM_RBUTTONDBLCLK : WM_RBUTTONDOWN; } else { NOTREACHED(); diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc index e867091..bcfe51a 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc @@ -140,8 +140,7 @@ void PageActionImageView::OnMouseReleased(const views::MouseEvent& event, } bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) { - if (e.GetKeyCode() == ui::VKEY_SPACE || - e.GetKeyCode() == ui::VKEY_RETURN) { + if (e.key_code() == ui::VKEY_SPACE || e.key_code() == ui::VKEY_RETURN) { ExecuteAction(1, false); return true; } diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index c7bacbeb..886aec2 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -59,8 +59,7 @@ void StarView::OnMouseReleased(const views::MouseEvent& event, bool canceled) { } bool StarView::OnKeyPressed(const views::KeyEvent& e) { - if (e.GetKeyCode() == ui::VKEY_SPACE || - e.GetKeyCode() == ui::VKEY_RETURN) { + if (e.key_code() == ui::VKEY_SPACE || e.key_code() == ui::VKEY_RETURN) { command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); return true; } |