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

Side by Side Diff: athena/screen_lock/chrome/chrome_screen_lock_manager.cc

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/screen/screen_manager_unittest.cc ('k') | athena/screen_lock/screen_lock_manager_base.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 "athena/input/public/accelerator_manager.h" 5 #include "athena/input/public/accelerator_manager.h"
6 #include "athena/input/public/input_manager.h" 6 #include "athena/input/public/input_manager.h"
7 #include "athena/screen_lock/screen_lock_manager_base.h" 7 #include "athena/screen_lock/screen_lock_manager_base.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 9 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
10 10
(...skipping 10 matching lines...) Expand all
21 21
22 class ChromeScreenLockManager : public ScreenLockManagerBase, 22 class ChromeScreenLockManager : public ScreenLockManagerBase,
23 public AcceleratorHandler, 23 public AcceleratorHandler,
24 public PowerButtonObserver { 24 public PowerButtonObserver {
25 public: 25 public:
26 ChromeScreenLockManager() {} 26 ChromeScreenLockManager() {}
27 27
28 void Init(); 28 void Init();
29 29
30 protected: 30 protected:
31 virtual ~ChromeScreenLockManager(); 31 ~ChromeScreenLockManager() override;
32 32
33 private: 33 private:
34 // ScreenLockManager: 34 // ScreenLockManager:
35 virtual void LockScreen() override; 35 void LockScreen() override;
36 36
37 // AcceleratorHandler: 37 // AcceleratorHandler:
38 virtual bool IsCommandEnabled(int command_id) const override; 38 bool IsCommandEnabled(int command_id) const override;
39 virtual bool OnAcceleratorFired(int command_id, 39 bool OnAcceleratorFired(int command_id,
40 const ui::Accelerator& accelerator) override; 40 const ui::Accelerator& accelerator) override;
41 41
42 // PowerButtonObserver: 42 // PowerButtonObserver:
43 virtual void OnPowerButtonStateChanged(State state) override; 43 void OnPowerButtonStateChanged(State state) override;
44 44
45 DISALLOW_COPY_AND_ASSIGN(ChromeScreenLockManager); 45 DISALLOW_COPY_AND_ASSIGN(ChromeScreenLockManager);
46 }; 46 };
47 47
48 ChromeScreenLockManager::~ChromeScreenLockManager() { 48 ChromeScreenLockManager::~ChromeScreenLockManager() {
49 InputManager::Get()->RemovePowerButtonObserver(this); 49 InputManager::Get()->RemovePowerButtonObserver(this);
50 } 50 }
51 51
52 void ChromeScreenLockManager::Init() { 52 void ChromeScreenLockManager::Init() {
53 AcceleratorManager::Get()->RegisterAccelerators( 53 AcceleratorManager::Get()->RegisterAccelerators(
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } // namespace 85 } // namespace
86 86
87 // static 87 // static
88 ScreenLockManager* ScreenLockManager::Create() { 88 ScreenLockManager* ScreenLockManager::Create() {
89 ChromeScreenLockManager* instance = new ChromeScreenLockManager(); 89 ChromeScreenLockManager* instance = new ChromeScreenLockManager();
90 instance->Init(); 90 instance->Init();
91 return instance; 91 return instance;
92 } 92 }
93 93
94 } // namespace athena 94 } // namespace athena
OLDNEW
« no previous file with comments | « athena/screen/screen_manager_unittest.cc ('k') | athena/screen_lock/screen_lock_manager_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698