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

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

Issue 11312139: Add SystemTrayObservers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/volume_control_delegate.h" 8 #include "ash/volume_control_delegate.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 volume_control_delegate_( 55 volume_control_delegate_(
56 ALLOW_THIS_IN_INITIALIZER_LIST(new TestVolumeControlDelegate)) { 56 ALLOW_THIS_IN_INITIALIZER_LIST(new TestVolumeControlDelegate)) {
57 } 57 }
58 58
59 TestSystemTrayDelegate::~TestSystemTrayDelegate() { 59 TestSystemTrayDelegate::~TestSystemTrayDelegate() {
60 } 60 }
61 61
62 void TestSystemTrayDelegate::Initialize() { 62 void TestSystemTrayDelegate::Initialize() {
63 } 63 }
64 64
65 SystemTrayObservers* TestSystemTrayDelegate::GetSystemTrayObservers() {
66 return NULL;
67 }
68
65 bool TestSystemTrayDelegate::GetTrayVisibilityOnStartup() { 69 bool TestSystemTrayDelegate::GetTrayVisibilityOnStartup() {
66 return true; 70 return true;
67 } 71 }
68 72
69 // Overridden from SystemTrayDelegate: 73 // Overridden from SystemTrayDelegate:
70 const string16 TestSystemTrayDelegate::GetUserDisplayName() const { 74 const string16 TestSystemTrayDelegate::GetUserDisplayName() const {
71 return UTF8ToUTF16("Über tray Über tray Über tray Über tray"); 75 return UTF8ToUTF16("Über tray Über tray Über tray Über tray");
72 } 76 }
73 77
74 const std::string TestSystemTrayDelegate::GetUserEmail() const { 78 const std::string TestSystemTrayDelegate::GetUserEmail() const {
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 return volume_control_delegate_.get(); 282 return volume_control_delegate_.get();
279 } 283 }
280 284
281 void TestSystemTrayDelegate::SetVolumeControlDelegate( 285 void TestSystemTrayDelegate::SetVolumeControlDelegate(
282 scoped_ptr<VolumeControlDelegate> delegate) { 286 scoped_ptr<VolumeControlDelegate> delegate) {
283 volume_control_delegate_ = delegate.Pass(); 287 volume_control_delegate_ = delegate.Pass();
284 } 288 }
285 289
286 } // namespace test 290 } // namespace test
287 } // namespace ash 291 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698