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

Side by Side Diff: athena/input/input_manager_impl.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 | « athena/input/accelerator_manager_unittest.cc ('k') | athena/input/input_manager_unittest.cc » ('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 #ifndef ATHENA_INPUT_INPUT_MANAGER_IMPL_H_ 5 #ifndef ATHENA_INPUT_INPUT_MANAGER_IMPL_H_
6 #define ATHENA_INPUT_INPUT_MANAGER_IMPL_H_ 6 #define ATHENA_INPUT_INPUT_MANAGER_IMPL_H_
7 7
8 #include "athena/input/public/input_manager.h" 8 #include "athena/input/public/input_manager.h"
9 9
10 #include "athena/athena_export.h" 10 #include "athena/athena_export.h"
11 #include "athena/input/accelerator_manager_impl.h" 11 #include "athena/input/accelerator_manager_impl.h"
12 #include "ui/aura/client/event_client.h" 12 #include "ui/aura/client/event_client.h"
13 #include "ui/events/event_target.h" 13 #include "ui/events/event_target.h"
14 14
15 namespace athena { 15 namespace athena {
16 class PowerButtonController; 16 class PowerButtonController;
17 17
18 namespace test { 18 namespace test {
19 class ScopedPowerButtonTimeoutShortener; 19 class ScopedPowerButtonTimeoutShortener;
20 } 20 }
21 21
22 class ATHENA_EXPORT InputManagerImpl : public InputManager, 22 class ATHENA_EXPORT InputManagerImpl : public InputManager,
23 public ui::EventTarget, 23 public ui::EventTarget,
24 public aura::client::EventClient { 24 public aura::client::EventClient {
25 public: 25 public:
26 InputManagerImpl(); 26 InputManagerImpl();
27 virtual ~InputManagerImpl(); 27 ~InputManagerImpl() override;
28 28
29 void Init(); 29 void Init();
30 void Shutdown(); 30 void Shutdown();
31 31
32 private: 32 private:
33 friend class test::ScopedPowerButtonTimeoutShortener; 33 friend class test::ScopedPowerButtonTimeoutShortener;
34 34
35 // InputManager: 35 // InputManager:
36 virtual void OnRootWindowCreated(aura::Window* root_window) override; 36 virtual void OnRootWindowCreated(aura::Window* root_window) override;
37 virtual ui::EventTarget* GetTopmostEventTarget() override; 37 virtual ui::EventTarget* GetTopmostEventTarget() override;
(...skipping 18 matching lines...) Expand all
56 56
57 scoped_ptr<AcceleratorManagerImpl> accelerator_manager_; 57 scoped_ptr<AcceleratorManagerImpl> accelerator_manager_;
58 scoped_ptr<PowerButtonController> power_button_controller_; 58 scoped_ptr<PowerButtonController> power_button_controller_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(InputManagerImpl); 60 DISALLOW_COPY_AND_ASSIGN(InputManagerImpl);
61 }; 61 };
62 62
63 } // namespace athena 63 } // namespace athena
64 64
65 #endif // ATHENA_INPUT_INPUT_MANAGER_IMPL_H_ 65 #endif // ATHENA_INPUT_INPUT_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « athena/input/accelerator_manager_unittest.cc ('k') | athena/input/input_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698