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

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

Issue 14305026: ash: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test_system_tray_delegate.h" 5 #include "ash/system/tray/test_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/session_state_delegate.h" 9 #include "ash/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 DISALLOW_COPY_AND_ASSIGN(TestVolumeControlDelegate); 50 DISALLOW_COPY_AND_ASSIGN(TestVolumeControlDelegate);
51 }; 51 };
52 52
53 } // namespace 53 } // namespace
54 54
55 TestSystemTrayDelegate::TestSystemTrayDelegate() 55 TestSystemTrayDelegate::TestSystemTrayDelegate()
56 : wifi_enabled_(true), 56 : wifi_enabled_(true),
57 cellular_enabled_(true), 57 cellular_enabled_(true),
58 bluetooth_enabled_(true), 58 bluetooth_enabled_(true),
59 caps_lock_enabled_(false), 59 caps_lock_enabled_(false),
60 volume_control_delegate_( 60 volume_control_delegate_(new TestVolumeControlDelegate) {
61 ALLOW_THIS_IN_INITIALIZER_LIST(new TestVolumeControlDelegate)) {
62 } 61 }
63 62
64 TestSystemTrayDelegate::~TestSystemTrayDelegate() { 63 TestSystemTrayDelegate::~TestSystemTrayDelegate() {
65 } 64 }
66 65
67 void TestSystemTrayDelegate::Initialize() { 66 void TestSystemTrayDelegate::Initialize() {
68 } 67 }
69 68
70 void TestSystemTrayDelegate::Shutdown() { 69 void TestSystemTrayDelegate::Shutdown() {
71 } 70 }
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 base::string16 TestSystemTrayDelegate::FormatTimeDuration( 365 base::string16 TestSystemTrayDelegate::FormatTimeDuration(
367 const base::TimeDelta& delta) const { 366 const base::TimeDelta& delta) const {
368 return base::string16(); 367 return base::string16();
369 } 368 }
370 369
371 void TestSystemTrayDelegate::MaybeSpeak(const std::string& utterance) const { 370 void TestSystemTrayDelegate::MaybeSpeak(const std::string& utterance) const {
372 } 371 }
373 372
374 } // namespace test 373 } // namespace test
375 } // namespace ash 374 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_icon_animation.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698