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

Side by Side Diff: ui/wm/core/nested_accelerator_controller.h

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
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 #ifndef UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_ 5 #ifndef UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_
6 #define UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_ 6 #define UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "ui/wm/public/dispatcher_client.h" 10 #include "ui/wm/public/dispatcher_client.h"
(...skipping 11 matching lines...) Expand all
22 class WM_EXPORT NestedAcceleratorController 22 class WM_EXPORT NestedAcceleratorController
23 : public aura::client::DispatcherClient { 23 : public aura::client::DispatcherClient {
24 public: 24 public:
25 explicit NestedAcceleratorController(NestedAcceleratorDelegate* delegate); 25 explicit NestedAcceleratorController(NestedAcceleratorDelegate* delegate);
26 virtual ~NestedAcceleratorController(); 26 virtual ~NestedAcceleratorController();
27 27
28 // aura::client::DispatcherClient: 28 // aura::client::DispatcherClient:
29 virtual void PrepareNestedLoopClosures( 29 virtual void PrepareNestedLoopClosures(
30 base::MessagePumpDispatcher* dispatcher, 30 base::MessagePumpDispatcher* dispatcher,
31 base::Closure* run_closure, 31 base::Closure* run_closure,
32 base::Closure* quit_closure) OVERRIDE; 32 base::Closure* quit_closure) override;
33 33
34 private: 34 private:
35 void RunNestedMessageLoop(scoped_ptr<base::RunLoop> run_loop, 35 void RunNestedMessageLoop(scoped_ptr<base::RunLoop> run_loop,
36 scoped_ptr<NestedAcceleratorDispatcher> dispatcher); 36 scoped_ptr<NestedAcceleratorDispatcher> dispatcher);
37 void QuitNestedMessageLoop(const base::Closure& quit_runloop); 37 void QuitNestedMessageLoop(const base::Closure& quit_runloop);
38 38
39 scoped_ptr<NestedAcceleratorDispatcher> accelerator_dispatcher_; 39 scoped_ptr<NestedAcceleratorDispatcher> accelerator_dispatcher_;
40 scoped_ptr<NestedAcceleratorDelegate> dispatcher_delegate_; 40 scoped_ptr<NestedAcceleratorDelegate> dispatcher_delegate_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorController); 42 DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorController);
43 }; 43 };
44 44
45 } // namespace wm 45 } // namespace wm
46 46
47 #endif // UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_ 47 #endif // UI_WM_CORE_NESTED_ACCELERATOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/wm/core/masked_window_targeter.h ('k') | ui/wm/core/nested_accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698