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

Side by Side Diff: ui/views/corewm/activation_change_shim.cc

Issue 11308322: events: Start changing EventHandler interface to not return a value. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/corewm/activation_change_shim.h ('k') | ui/views/corewm/focus_change_shim.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/corewm/activation_change_shim.h" 5 #include "ui/views/corewm/activation_change_shim.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/base/events/event_target.h" 9 #include "ui/base/events/event_target.h"
10 #include "ui/views/corewm/corewm_switches.h" 10 #include "ui/views/corewm/corewm_switches.h"
(...skipping 16 matching lines...) Expand all
27 27
28 ActivationChangeShim::~ActivationChangeShim() { 28 ActivationChangeShim::~ActivationChangeShim() {
29 if (UseFocusController() && target_) 29 if (UseFocusController() && target_)
30 target_->RemovePreTargetHandler(this); 30 target_->RemovePreTargetHandler(this);
31 } 31 }
32 32
33 void ActivationChangeShim::OnWindowActivated(aura::Window* active, 33 void ActivationChangeShim::OnWindowActivated(aura::Window* active,
34 aura::Window* old_active) { 34 aura::Window* old_active) {
35 } 35 }
36 36
37 ui::EventResult ActivationChangeShim::OnEvent(ui::Event* event) { 37 void ActivationChangeShim::OnEvent(ui::Event* event) {
38 if (event->type() == FocusChangeEvent::activation_changed_event_type()) { 38 if (event->type() == FocusChangeEvent::activation_changed_event_type()) {
39 DCHECK(UseFocusController()); 39 DCHECK(UseFocusController());
40 FocusChangeEvent* fce = static_cast<FocusChangeEvent*>(event); 40 FocusChangeEvent* fce = static_cast<FocusChangeEvent*>(event);
41 OnWindowActivated(static_cast<aura::Window*>(event->target()), 41 OnWindowActivated(static_cast<aura::Window*>(event->target()),
42 static_cast<aura::Window*>(fce->last_focus())); 42 static_cast<aura::Window*>(fce->last_focus()));
43 } 43 }
44 return EventHandler::OnEvent(event); 44 EventHandler::OnEvent(event);
45 } 45 }
46 46
47 } // namespace corewm 47 } // namespace corewm
48 } // namespace views 48 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/corewm/activation_change_shim.h ('k') | ui/views/corewm/focus_change_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698