summaryrefslogtreecommitdiffstats
path: root/ui/views/focus
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 06:50:43 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 06:50:43 +0000
commit07360f2ee621c42c0f76ef0fcc197e9429adf7d0 (patch)
tree5a1417afc0b9789456387cd31c5e987df5828d27 /ui/views/focus
parentf9c77079e80f1bd5e84b501b65ca1c4bdbede467 (diff)
downloadchromium_src-07360f2ee621c42c0f76ef0fcc197e9429adf7d0.zip
chromium_src-07360f2ee621c42c0f76ef0fcc197e9429adf7d0.tar.gz
chromium_src-07360f2ee621c42c0f76ef0fcc197e9429adf7d0.tar.bz2
* removed views debug paint that was used in NativeWidgetGtk.
This may be useful on aura, but should probably be in layer/compositor code * removed unnecessary ifdef that were for linux+views+non aura. * updated gtk related descriptions BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9968058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus')
-rw-r--r--ui/views/focus/focus_manager.cc3
-rw-r--r--ui/views/focus/focus_manager_unittest_win.cc4
2 files changed, 3 insertions, 4 deletions
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index b7a4d1b..1467f25 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -80,8 +80,7 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) {
#if defined(OS_WIN)
// If the focused view wants to process the key event as is, let it be.
- // On Linux we always dispatch key events to the focused view first, so
- // we should not do this check here. See also NativeWidgetGtk::OnKeyEvent().
+ // This is not used for linux/aura.
if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
!accelerator_manager_->HasPriorityHandler(accelerator))
return true;
diff --git a/ui/views/focus/focus_manager_unittest_win.cc b/ui/views/focus/focus_manager_unittest_win.cc
index 6f47d58..d6a9882 100644
--- a/ui/views/focus/focus_manager_unittest_win.cc
+++ b/ui/views/focus/focus_manager_unittest_win.cc
@@ -201,8 +201,8 @@ TEST_F(FocusManagerTest, CreationForNativeRoot) {
// Tests that the keyup messages are eaten for accelerators.
// Windows-only, Windows is the only platform that handles accelerators in
-// AcceleratorHandler. NativeWidgetAura/NativeWidgetGtk::OnKeyEvent handles
-// them in other configurations.
+// AcceleratorHandler. NativeWidgetAura::OnKeyEvent handles them in other
+// configurations.
TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
FocusManager* focus_manager = GetFocusManager();
MessageTrackingView* mtv = new MessageTrackingView();