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

Side by Side Diff: ui/views/test/event_generator_delegate_mac.mm

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/test/desktop_test_views_delegate.h ('k') | ui/views/test/focus_manager_test.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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "base/mac/scoped_objc_class_swizzler.h" 7 #import "base/mac/scoped_objc_class_swizzler.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "ui/events/event_processor.h" 9 #include "ui/events/event_processor.h"
10 #include "ui/events/event_target.h" 10 #include "ui/events/event_target.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 public ui::EventSource, 236 public ui::EventSource,
237 public ui::EventProcessor, 237 public ui::EventProcessor,
238 public ui::EventTargeter, 238 public ui::EventTargeter,
239 public ui::test::EventGeneratorDelegate { 239 public ui::test::EventGeneratorDelegate {
240 public: 240 public:
241 static EventGeneratorDelegateMac* GetInstance() { 241 static EventGeneratorDelegateMac* GetInstance() {
242 return Singleton<EventGeneratorDelegateMac>::get(); 242 return Singleton<EventGeneratorDelegateMac>::get();
243 } 243 }
244 244
245 // Overridden from ui::EventTarget: 245 // Overridden from ui::EventTarget:
246 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE { return true; } 246 virtual bool CanAcceptEvent(const ui::Event& event) override { return true; }
247 virtual ui::EventTarget* GetParentTarget() OVERRIDE { return NULL; } 247 virtual ui::EventTarget* GetParentTarget() override { return NULL; }
248 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; 248 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
249 virtual ui::EventTargeter* GetEventTargeter() OVERRIDE { 249 virtual ui::EventTargeter* GetEventTargeter() override {
250 return this; 250 return this;
251 } 251 }
252 252
253 // Overridden from ui::EventHandler (via ui::EventTarget): 253 // Overridden from ui::EventHandler (via ui::EventTarget):
254 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 254 virtual void OnMouseEvent(ui::MouseEvent* event) override;
255 255
256 // Overridden from ui::EventSource: 256 // Overridden from ui::EventSource:
257 virtual ui::EventProcessor* GetEventProcessor() OVERRIDE { return this; } 257 virtual ui::EventProcessor* GetEventProcessor() override { return this; }
258 258
259 // Overridden from ui::EventProcessor: 259 // Overridden from ui::EventProcessor:
260 virtual ui::EventTarget* GetRootTarget() OVERRIDE { return this; } 260 virtual ui::EventTarget* GetRootTarget() override { return this; }
261 261
262 // Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor): 262 // Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor):
263 virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE { 263 virtual bool CanDispatchToTarget(EventTarget* target) override {
264 return true; 264 return true;
265 } 265 }
266 266
267 // Overridden from ui::test::EventGeneratorDelegate: 267 // Overridden from ui::test::EventGeneratorDelegate:
268 virtual void SetContext(ui::test::EventGenerator* owner, 268 virtual void SetContext(ui::test::EventGenerator* owner,
269 gfx::NativeWindow root_window, 269 gfx::NativeWindow root_window,
270 gfx::NativeWindow window) OVERRIDE; 270 gfx::NativeWindow window) override;
271 virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) OVERRIDE { 271 virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) override {
272 return this; 272 return this;
273 } 273 }
274 virtual ui::EventSource* GetEventSource(ui::EventTarget* target) OVERRIDE { 274 virtual ui::EventSource* GetEventSource(ui::EventTarget* target) override {
275 return this; 275 return this;
276 } 276 }
277 virtual gfx::Point CenterOfTarget( 277 virtual gfx::Point CenterOfTarget(
278 const ui::EventTarget* target) const OVERRIDE; 278 const ui::EventTarget* target) const override;
279 virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const OVERRIDE; 279 virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const override;
280 280
281 virtual void ConvertPointFromTarget(const ui::EventTarget* target, 281 virtual void ConvertPointFromTarget(const ui::EventTarget* target,
282 gfx::Point* point) const OVERRIDE {} 282 gfx::Point* point) const override {}
283 virtual void ConvertPointToTarget(const ui::EventTarget* target, 283 virtual void ConvertPointToTarget(const ui::EventTarget* target,
284 gfx::Point* point) const OVERRIDE {} 284 gfx::Point* point) const override {}
285 virtual void ConvertPointFromHost(const ui::EventTarget* hosted_target, 285 virtual void ConvertPointFromHost(const ui::EventTarget* hosted_target,
286 gfx::Point* point) const OVERRIDE {} 286 gfx::Point* point) const override {}
287 287
288 private: 288 private:
289 friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>; 289 friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>;
290 290
291 EventGeneratorDelegateMac(); 291 EventGeneratorDelegateMac();
292 virtual ~EventGeneratorDelegateMac(); 292 virtual ~EventGeneratorDelegateMac();
293 293
294 ui::test::EventGenerator* owner_; 294 ui::test::EventGenerator* owner_;
295 NSWindow* window_; 295 NSWindow* window_;
296 scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_pressed_; 296 scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_pressed_;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 namespace views { 356 namespace views {
357 namespace test { 357 namespace test {
358 358
359 void InitializeMacEventGeneratorDelegate() { 359 void InitializeMacEventGeneratorDelegate() {
360 EventGeneratorDelegateMac::GetInstance(); 360 EventGeneratorDelegateMac::GetInstance();
361 } 361 }
362 362
363 } // namespace test 363 } // namespace test
364 } // namespace views 364 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/desktop_test_views_delegate.h ('k') | ui/views/test/focus_manager_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698