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

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

Issue 2389403003: chromeos: Don't explicitly set system tray visibility during initialization (Closed)
Patch Set: unused var on windows Created 4 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/common/system/tray/default_system_tray_delegate.h" 5 #include "ash/common/system/tray/default_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/common/system/networking_config_delegate.h" 10 #include "ash/common/system/networking_config_delegate.h"
11 #include "ash/common/system/volume_control_delegate.h" 11 #include "ash/common/system/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 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() 17 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate()
18 : bluetooth_enabled_(true) {} 18 : bluetooth_enabled_(true) {}
19 19
20 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() {} 20 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() {}
21 21
22 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() {
23 return true;
24 }
25
26 LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const { 22 LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const {
27 return LoginStatus::USER; 23 return LoginStatus::USER;
28 } 24 }
29 25
30 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const { 26 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const {
31 if (!IsUserSupervised()) 27 if (!IsUserSupervised())
32 return std::string(); 28 return std::string();
33 return "manager@chrome.com"; 29 return "manager@chrome.com";
34 } 30 }
35 31
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 std::unique_ptr<VolumeControlDelegate> delegate) { 77 std::unique_ptr<VolumeControlDelegate> delegate) {
82 volume_control_delegate_ = std::move(delegate); 78 volume_control_delegate_ = std::move(delegate);
83 } 79 }
84 80
85 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { 81 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
86 // This is the default width for English languages. 82 // This is the default width for English languages.
87 return 300; 83 return 300;
88 } 84 }
89 85
90 } // namespace ash 86 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/default_system_tray_delegate.h ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698