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

Side by Side Diff: ash/system/tray/default_system_tray_delegate.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/system/tray/default_system_tray_delegate.h" 5 #include "ash/system/tray/default_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/volume_control_delegate.h" 11 #include "ash/volume_control_delegate.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
17 namespace { 17 namespace {
18 18
19 class DefaultVolumnControlDelegate : public VolumeControlDelegate { 19 class DefaultVolumnControlDelegate : public VolumeControlDelegate {
20 public: 20 public:
21 DefaultVolumnControlDelegate() {} 21 DefaultVolumnControlDelegate() {}
22 virtual ~DefaultVolumnControlDelegate() {} 22 virtual ~DefaultVolumnControlDelegate() {}
23 23
24 virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE { 24 virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) override {
25 return true; 25 return true;
26 } 26 }
27 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE { 27 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) override {
28 return true; 28 return true;
29 } 29 }
30 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE { 30 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) override {
31 return true; 31 return true;
32 } 32 }
33 33
34 private: 34 private:
35 DISALLOW_COPY_AND_ASSIGN(DefaultVolumnControlDelegate); 35 DISALLOW_COPY_AND_ASSIGN(DefaultVolumnControlDelegate);
36 }; 36 };
37 37
38 } // namespace 38 } // namespace
39 39
40 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() 40 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate()
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { 282 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
283 return false; 283 return false;
284 } 284 }
285 285
286 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( 286 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
287 const std::string& user_id) { 287 const std::string& user_id) {
288 return NULL; 288 return NULL;
289 } 289 }
290 290
291 } // namespace ash 291 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/fixed_sized_image_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698