diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:41:48 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:41:48 +0000 |
| commit | 981e66948a84c10067e9064b6ef482ba5bb277cf (patch) | |
| tree | c67dd1a65eee9d5174c4bfdd269f6bdc2acac430 /chrome/browser/ui/views/location_bar | |
| parent | e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c (diff) | |
| download | chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.zip chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.tar.gz chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.tar.bz2 | |
Revert 74377 - Migrate Event API methods to Google Style.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6480001
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6469014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/location_bar')
3 files changed, 7 insertions, 5 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 08188c6..6634354 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.flags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? + msg = (event.GetFlags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? WM_LBUTTONDBLCLK : WM_LBUTTONDOWN; } else if (event.IsMiddleMouseButton()) { - msg = (event.flags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? + msg = (event.GetFlags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? WM_MBUTTONDBLCLK : WM_MBUTTONDOWN; } else if (event.IsRightMouseButton()) { - msg = (event.flags() & views::MouseEvent::EF_IS_DOUBLE_CLICK) ? + msg = (event.GetFlags() & 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 bcfe51a..e867091 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,7 +140,8 @@ void PageActionImageView::OnMouseReleased(const views::MouseEvent& event, } bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) { - if (e.key_code() == ui::VKEY_SPACE || e.key_code() == ui::VKEY_RETURN) { + if (e.GetKeyCode() == ui::VKEY_SPACE || + e.GetKeyCode() == 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 886aec2..c7bacbeb 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -59,7 +59,8 @@ void StarView::OnMouseReleased(const views::MouseEvent& event, bool canceled) { } bool StarView::OnKeyPressed(const views::KeyEvent& e) { - if (e.key_code() == ui::VKEY_SPACE || e.key_code() == ui::VKEY_RETURN) { + if (e.GetKeyCode() == ui::VKEY_SPACE || + e.GetKeyCode() == ui::VKEY_RETURN) { command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); return true; } |