Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_win.cc

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge Created 10 years, 4 months 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
Index: chrome/browser/autocomplete/autocomplete_edit_view_win.cc
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index f7204a51d492d0cb836e570acd17298da067f9dd..1e5d9c0d32d95a731d75a8a33317d1f9a6577294 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -13,6 +13,7 @@
#include "app/clipboard/clipboard.h"
#include "app/clipboard/scoped_clipboard_writer.h"
+#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "app/os_exchange_data.h"
@@ -24,7 +25,6 @@
#include "base/basictypes.h"
#include "base/i18n/rtl.h"
#include "base/iat_patch.h"
-#include "base/keyboard_codes.h"
#include "base/lazy_instance.h"
#include "base/ref_counted.h"
#include "base/utf_string_conversions.h"
@@ -873,10 +873,10 @@ void AutocompleteEditViewWin::PasteAndGo(const std::wstring& text) {
bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
const views::KeyEvent& e) {
- base::KeyboardCode key = e.GetKeyCode();
+ app::KeyboardCode key = e.GetKeyCode();
// 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 != base::VKEY_HOME) &&
+ if (e.IsAltDown() && (key != app::VKEY_HOME) &&
win_util::IsNumPadDigit(key, e.IsExtendedKey()))
return true;
@@ -888,28 +888,28 @@ bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
// accelerators (e.g., F5 for reload the page should work even when the
// Omnibox gets focused).
switch (key) {
- case base::VKEY_ESCAPE: {
+ case app::VKEY_ESCAPE: {
ScopedFreeze freeze(this, GetTextObjectModel());
return model_->OnEscapeKeyPressed();
}
- case base::VKEY_RETURN:
+ case app::VKEY_RETURN:
return true;
- case base::VKEY_UP:
- case base::VKEY_DOWN:
+ case app::VKEY_UP:
+ case app::VKEY_DOWN:
return !e.IsAltDown();
- case base::VKEY_DELETE:
- case base::VKEY_INSERT:
+ case app::VKEY_DELETE:
+ case app::VKEY_INSERT:
return !e.IsAltDown() && e.IsShiftDown() && !e.IsControlDown();
- case base::VKEY_X:
- case base::VKEY_V:
+ case app::VKEY_X:
+ case app::VKEY_V:
return !e.IsAltDown() && e.IsControlDown();
- case base::VKEY_BACK:
- case base::VKEY_OEM_PLUS:
+ case app::VKEY_BACK:
+ case app::VKEY_OEM_PLUS:
return true;
default:
@@ -1754,7 +1754,7 @@ void AutocompleteEditViewWin::HandleKeystroke(UINT message,
ScopedFreeze freeze(this, GetTextObjectModel());
OnBeforePossibleChange();
- if (key == base::VKEY_HOME || key == base::VKEY_END) {
+ if (key == app::VKEY_HOME || key == app::VKEY_END) {
// DefWindowProc() might reset the keyboard layout when it receives a
// keydown event for VKEY_HOME or VKEY_END. When the window was created
// with WS_EX_LAYOUTRTL and the current keyboard layout is not a RTL one,
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc ('k') | chrome/browser/automation/automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698