summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 23:28:06 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 23:28:06 +0000
commite2e88e7f5dbcbb2367d632b534ca0e75aab9f25c (patch)
tree05402030dd11561f128734a8df6e2e6a848fc366 /chrome/browser/autocomplete
parent6e472da04f540d7837b7a344383869013bc57a3d (diff)
downloadchromium_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/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_views.cc20
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_win.cc2
2 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
index c030c57..80baa0d 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
@@ -165,21 +165,21 @@ bool AutocompleteEditViewViews::HandleAfterKeyEvent(
if (content_maybe_changed_by_key_press_)
OnAfterPossibleChange();
- if (event.GetKeyCode() == ui::VKEY_RETURN) {
+ if (event.key_code() == ui::VKEY_RETURN) {
bool alt_held = event.IsAltDown();
model_->AcceptInput(alt_held ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
handled = true;
- } else if (!handled && event.GetKeyCode() == ui::VKEY_ESCAPE) {
+ } else if (!handled && event.key_code() == ui::VKEY_ESCAPE) {
// We can handle the Escape key if textfield did not handle it.
// If it's not handled by us, then we need to propagate it up to the parent
// widgets, so that Escape accelerator can still work.
handled = model_->OnEscapeKeyPressed();
- } else if (event.GetKeyCode() == ui::VKEY_CONTROL) {
+ } else if (event.key_code() == ui::VKEY_CONTROL) {
// Omnibox2 can switch its contents while pressing a control key. To switch
// the contents of omnibox2, we notify the AutocompleteEditModel class when
// the control-key state is changed.
model_->OnControlKeyChanged(true);
- } else if (!text_changed_ && event.GetKeyCode() == ui::VKEY_DELETE &&
+ } else if (!text_changed_ && event.key_code() == ui::VKEY_DELETE &&
event.IsShiftDown()) {
// If shift+del didn't change the text, we let this delete an entry from
// the popup. We can't check to see if the IME handled it because even if
@@ -187,14 +187,14 @@ bool AutocompleteEditViewViews::HandleAfterKeyEvent(
AutocompletePopupModel* popup_model = popup_view_->GetModel();
if (popup_model->IsOpen())
popup_model->TryDeletingCurrentItem();
- } else if (!handled && event.GetKeyCode() == ui::VKEY_UP) {
+ } else if (!handled && event.key_code() == ui::VKEY_UP) {
model_->OnUpOrDownKeyPressed(-1);
handled = true;
- } else if (!handled && event.GetKeyCode() == ui::VKEY_DOWN) {
+ } else if (!handled && event.key_code() == ui::VKEY_DOWN) {
model_->OnUpOrDownKeyPressed(1);
handled = true;
} else if (!handled &&
- event.GetKeyCode() == ui::VKEY_TAB &&
+ event.key_code() == ui::VKEY_TAB &&
!event.IsShiftDown() &&
!event.IsControlDown()) {
if (model_->is_keyword_hint()) {
@@ -224,7 +224,7 @@ bool AutocompleteEditViewViews::HandleKeyReleaseEvent(
// Omnibox2 can switch its contents while pressing a control key. To switch
// the contents of omnibox2, we notify the AutocompleteEditModel class when
// the control-key state is changed.
- if (event.GetKeyCode() == ui::VKEY_CONTROL) {
+ if (event.key_code() == ui::VKEY_CONTROL) {
// TODO(oshima): investigate if we need to support keyboard with two
// controls. See autocomplete_edit_view_gtk.cc.
model_->OnControlKeyChanged(false);
@@ -583,7 +583,7 @@ void AutocompleteEditViewViews::ContentsChanged(views::Textfield* sender,
bool AutocompleteEditViewViews::HandleKeyEvent(
views::Textfield* textfield,
const views::KeyEvent& event) {
- delete_was_pressed_ = event.GetKeyCode() == ui::VKEY_DELETE;
+ delete_was_pressed_ = event.key_code() == ui::VKEY_DELETE;
// Reset |text_changed_| before passing the key event on to the text view.
text_changed_ = false;
@@ -591,7 +591,7 @@ bool AutocompleteEditViewViews::HandleKeyEvent(
handling_key_press_ = true;
content_maybe_changed_by_key_press_ = false;
- if (event.GetKeyCode() == ui::VKEY_BACK) {
+ if (event.key_code() == ui::VKEY_BACK) {
// Checks if it's currently in keyword search mode.
if (model_->is_keyword_hint() || model_->keyword().empty())
return false;
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 6366873..889d682 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -969,7 +969,7 @@ void AutocompleteEditViewWin::PasteAndGo(const string16& text) {
bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
const views::KeyEvent& e) {
- ui::KeyboardCode key = e.GetKeyCode();
+ ui::KeyboardCode key = e.key_code();
// We don't process ALT + numpad digit as accelerators, they are used for
// entering special characters. We do translate alt-home.
if (e.IsAltDown() && (key != ui::VKEY_HOME) &&