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

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

Issue 1376663002: Remove const qualifier from function return type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.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 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/networking_config_delegate.h" 9 #include "ash/networking_config_delegate.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 12 matching lines...) Expand all
23 } 23 }
24 24
25 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() { 25 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() {
26 return true; 26 return true;
27 } 27 }
28 28
29 user::LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const { 29 user::LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const {
30 return user::LOGGED_IN_USER; 30 return user::LOGGED_IN_USER;
31 } 31 }
32 32
33 const std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const { 33 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const {
34 if (!IsUserSupervised()) 34 if (!IsUserSupervised())
35 return std::string(); 35 return std::string();
36 return "manager@chrome.com"; 36 return "manager@chrome.com";
37 } 37 }
38 38
39 bool DefaultSystemTrayDelegate::IsUserSupervised() const { 39 bool DefaultSystemTrayDelegate::IsUserSupervised() const {
40 return GetUserLoginStatus() == ash::user::LOGGED_IN_SUPERVISED; 40 return GetUserLoginStatus() == ash::user::LOGGED_IN_SUPERVISED;
41 } 41 }
42 42
43 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { 43 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 scoped_ptr<VolumeControlDelegate> delegate) { 84 scoped_ptr<VolumeControlDelegate> delegate) {
85 volume_control_delegate_ = delegate.Pass(); 85 volume_control_delegate_ = delegate.Pass();
86 } 86 }
87 87
88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { 88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
89 // This is the default width for English languages. 89 // This is the default width for English languages.
90 return 300; 90 return 300;
91 } 91 }
92 92
93 } // namespace ash 93 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698