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

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

Issue 2252823002: Updates to Ash material design icons used for TrayImageItem (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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"
(...skipping 21 matching lines...) Expand all
32 return std::string(); 32 return std::string();
33 return "manager@chrome.com"; 33 return "manager@chrome.com";
34 } 34 }
35 35
36 bool DefaultSystemTrayDelegate::IsUserSupervised() const { 36 bool DefaultSystemTrayDelegate::IsUserSupervised() const {
37 return GetUserLoginStatus() == LoginStatus::SUPERVISED; 37 return GetUserLoginStatus() == LoginStatus::SUPERVISED;
38 } 38 }
39 39
40 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { 40 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
41 DCHECK(info); 41 DCHECK(info);
42 info->severity = UpdateInfo::UPDATE_NORMAL; 42 info->severity = UpdateInfo::UPDATE_NONE;
43 info->update_required = true; 43 info->update_required = true;
44 info->factory_reset_required = false; 44 info->factory_reset_required = false;
45 } 45 }
46 46
47 bool DefaultSystemTrayDelegate::ShouldShowSettings() { 47 bool DefaultSystemTrayDelegate::ShouldShowSettings() {
48 return true; 48 return true;
49 } 49 }
50 50
51 bool DefaultSystemTrayDelegate::ShouldShowDisplayNotification() { 51 bool DefaultSystemTrayDelegate::ShouldShowDisplayNotification() {
52 return false; 52 return false;
(...skipping 28 matching lines...) Expand all
81 std::unique_ptr<VolumeControlDelegate> delegate) { 81 std::unique_ptr<VolumeControlDelegate> delegate) {
82 volume_control_delegate_ = std::move(delegate); 82 volume_control_delegate_ = std::move(delegate);
83 } 83 }
84 84
85 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { 85 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
86 // This is the default width for English languages. 86 // This is the default width for English languages.
87 return 300; 87 return 300;
88 } 88 }
89 89
90 } // namespace ash 90 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698