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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.cc

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge removal of compact nav. Created 9 years, 3 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/ui/views/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index d2994090c27338bfa6c6c791ebbcf080d5b0a6c3..e5503dc9e260af56c15202884fa3f1299af8e6db 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -45,6 +45,7 @@
#include "ui/base/dragdrop/drop_target.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+#include "ui/base/events.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_win.h"
@@ -53,7 +54,6 @@
#include "ui/gfx/canvas_skia.h"
#include "views/controls/textfield/native_textfield_win.h"
#include "views/drag_utils.h"
-#include "views/events/event_utils_win.h"
#include "views/widget/widget.h"
#pragma comment(lib, "oleacc.lib") // Needed for accessibility support.
@@ -994,7 +994,7 @@ bool OmniboxViewWin::SkipDefaultKeyEventProcessing(
// entering special characters. We do translate alt-home.
if (event.IsAltDown() && (key != ui::VKEY_HOME) &&
views::NativeTextfieldWin::IsNumPadDigit(key,
- views::IsExtendedKey(event)))
+ (event.flags() & ui::EF_EXTENDED) != 0))
return true;
// Skip accelerators for key combinations omnibox wants to crack. This list

Powered by Google App Engine
This is Rietveld 408576698