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

Side by Side Diff: ui/wm/core/nested_accelerator_dispatcher_win.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/wm/core/nested_accelerator_dispatcher_linux.cc ('k') | ui/wm/core/shadow.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/wm/core/nested_accelerator_dispatcher.h" 5 #include "ui/wm/core/nested_accelerator_dispatcher.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_pump_dispatcher.h" 8 #include "base/message_loop/message_pump_dispatcher.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "ui/base/accelerators/accelerator.h" 10 #include "ui/base/accelerators/accelerator.h"
(...skipping 17 matching lines...) Expand all
28 class NestedAcceleratorDispatcherWin : public NestedAcceleratorDispatcher, 28 class NestedAcceleratorDispatcherWin : public NestedAcceleratorDispatcher,
29 public MessagePumpDispatcher { 29 public MessagePumpDispatcher {
30 public: 30 public:
31 NestedAcceleratorDispatcherWin(NestedAcceleratorDelegate* delegate, 31 NestedAcceleratorDispatcherWin(NestedAcceleratorDelegate* delegate,
32 MessagePumpDispatcher* nested) 32 MessagePumpDispatcher* nested)
33 : NestedAcceleratorDispatcher(delegate), nested_dispatcher_(nested) {} 33 : NestedAcceleratorDispatcher(delegate), nested_dispatcher_(nested) {}
34 virtual ~NestedAcceleratorDispatcherWin() {} 34 virtual ~NestedAcceleratorDispatcherWin() {}
35 35
36 private: 36 private:
37 // NestedAcceleratorDispatcher: 37 // NestedAcceleratorDispatcher:
38 virtual scoped_ptr<base::RunLoop> CreateRunLoop() OVERRIDE { 38 virtual scoped_ptr<base::RunLoop> CreateRunLoop() override {
39 return scoped_ptr<base::RunLoop>(new base::RunLoop(this)); 39 return scoped_ptr<base::RunLoop>(new base::RunLoop(this));
40 } 40 }
41 41
42 // MessagePumpDispatcher: 42 // MessagePumpDispatcher:
43 virtual uint32_t Dispatch(const MSG& event) OVERRIDE { 43 virtual uint32_t Dispatch(const MSG& event) override {
44 if (IsKeyEvent(event)) { 44 if (IsKeyEvent(event)) {
45 ui::KeyEvent key_event(event); 45 ui::KeyEvent key_event(event);
46 ui::Accelerator accelerator = CreateAcceleratorFromKeyEvent(key_event); 46 ui::Accelerator accelerator = CreateAcceleratorFromKeyEvent(key_event);
47 47
48 switch (delegate_->ProcessAccelerator(accelerator)) { 48 switch (delegate_->ProcessAccelerator(accelerator)) {
49 case NestedAcceleratorDelegate::RESULT_PROCESS_LATER: 49 case NestedAcceleratorDelegate::RESULT_PROCESS_LATER:
50 return POST_DISPATCH_QUIT_LOOP; 50 return POST_DISPATCH_QUIT_LOOP;
51 case NestedAcceleratorDelegate::RESULT_PROCESSED: 51 case NestedAcceleratorDelegate::RESULT_PROCESSED:
52 return POST_DISPATCH_NONE; 52 return POST_DISPATCH_NONE;
53 case NestedAcceleratorDelegate::RESULT_NOT_PROCESSED: 53 case NestedAcceleratorDelegate::RESULT_NOT_PROCESSED:
(...skipping 11 matching lines...) Expand all
65 }; 65 };
66 66
67 scoped_ptr<NestedAcceleratorDispatcher> NestedAcceleratorDispatcher::Create( 67 scoped_ptr<NestedAcceleratorDispatcher> NestedAcceleratorDispatcher::Create(
68 NestedAcceleratorDelegate* delegate, 68 NestedAcceleratorDelegate* delegate,
69 MessagePumpDispatcher* nested_dispatcher) { 69 MessagePumpDispatcher* nested_dispatcher) {
70 return scoped_ptr<NestedAcceleratorDispatcher>( 70 return scoped_ptr<NestedAcceleratorDispatcher>(
71 new NestedAcceleratorDispatcherWin(delegate, nested_dispatcher)); 71 new NestedAcceleratorDispatcherWin(delegate, nested_dispatcher));
72 } 72 }
73 73
74 } // namespace wm 74 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/nested_accelerator_dispatcher_linux.cc ('k') | ui/wm/core/shadow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698