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

Side by Side Diff: ui/views/mouse_watcher_aura.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « ui/views/masked_targeter_delegate.h ('k') | ui/views/mouse_watcher_view_host.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/mouse_watcher.h" 5 #include "ui/views/mouse_watcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/event_types.h" 9 #include "base/event_types.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 18 matching lines...) Expand all
29 : mouse_watcher_(mouse_watcher), 29 : mouse_watcher_(mouse_watcher),
30 notify_listener_factory_(this) { 30 notify_listener_factory_(this) {
31 aura::Env::GetInstance()->AddPreTargetHandler(this); 31 aura::Env::GetInstance()->AddPreTargetHandler(this);
32 } 32 }
33 33
34 virtual ~Observer() { 34 virtual ~Observer() {
35 aura::Env::GetInstance()->RemovePreTargetHandler(this); 35 aura::Env::GetInstance()->RemovePreTargetHandler(this);
36 } 36 }
37 37
38 // ui::EventHandler implementation: 38 // ui::EventHandler implementation:
39 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { 39 virtual void OnMouseEvent(ui::MouseEvent* event) override {
40 switch (event->type()) { 40 switch (event->type()) {
41 case ui::ET_MOUSE_MOVED: 41 case ui::ET_MOUSE_MOVED:
42 case ui::ET_MOUSE_DRAGGED: 42 case ui::ET_MOUSE_DRAGGED:
43 HandleMouseEvent(MouseWatcherHost::MOUSE_MOVE); 43 HandleMouseEvent(MouseWatcherHost::MOUSE_MOVE);
44 break; 44 break;
45 case ui::ET_MOUSE_EXITED: 45 case ui::ET_MOUSE_EXITED:
46 HandleMouseEvent(MouseWatcherHost::MOUSE_EXIT); 46 HandleMouseEvent(MouseWatcherHost::MOUSE_EXIT);
47 break; 47 break;
48 default: 48 default:
49 break; 49 break;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void MouseWatcher::Stop() { 116 void MouseWatcher::Stop() {
117 observer_.reset(NULL); 117 observer_.reset(NULL);
118 } 118 }
119 119
120 void MouseWatcher::NotifyListener() { 120 void MouseWatcher::NotifyListener() {
121 observer_.reset(NULL); 121 observer_.reset(NULL);
122 listener_->MouseMovedOutOfHost(); 122 listener_->MouseMovedOutOfHost();
123 } 123 }
124 124
125 } // namespace views 125 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/masked_targeter_delegate.h ('k') | ui/views/mouse_watcher_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698