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

Unified Diff: ui/aura/toplevel_window_event_filter.cc

Issue 7980023: Fixes aura unit tests. There were a couple of problems: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « ui/aura/event_filter.cc ('k') | ui/aura/window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/toplevel_window_event_filter.cc
diff --git a/ui/aura/toplevel_window_event_filter.cc b/ui/aura/toplevel_window_event_filter.cc
index bf4395f01621a2754f0392357e834ba0eb9f1de2..be648c87b369a48c75bff13892dd05147e16f125 100644
--- a/ui/aura/toplevel_window_event_filter.cc
+++ b/ui/aura/toplevel_window_event_filter.cc
@@ -5,7 +5,6 @@
#include "ui/aura/toplevel_window_event_filter.h"
#include "ui/aura/event.h"
-#include "ui/aura/focus_manager.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
@@ -27,9 +26,6 @@ bool ToplevelWindowEventFilter::OnMouseEvent(Window* target,
MouseEvent* event) {
switch (event->type()) {
case ui::ET_MOUSE_PRESSED:
- // TODO(beng): some windows (e.g. disabled ones, tooltips, etc) may not be
- // focusable.
- target->GetFocusManager()->SetFocusedWindow(target);
window_component_ =
target->delegate()->GetNonClientComponent(event->location());
MoveWindowToFront(target);
@@ -53,7 +49,7 @@ bool ToplevelWindowEventFilter::OnMouseEvent(Window* target,
default:
break;
}
- return false;
+ return EventFilter::OnMouseEvent(target, event);
}
void ToplevelWindowEventFilter::MoveWindowToFront(Window* target) {
« no previous file with comments | « ui/aura/event_filter.cc ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698