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

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

Issue 2568413002: Revert of ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: Created 4 years 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 (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/common/system/tray/system_tray_delegate.h" 5 #include "ash/common/system/tray/system_tray_delegate.h"
6 6
7 #include "ash/common/system/tray/ime_info.h" 7 #include "ash/common/system/tray/ime_info.h"
8 #include "ash/common/system/tray/system_tray_item.h" 8 #include "ash/common/system/tray/system_tray_item.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 BluetoothDeviceInfo::BluetoothDeviceInfo() 12 BluetoothDeviceInfo::BluetoothDeviceInfo()
13 : connected(false), connecting(false), paired(false) {} 13 : connected(false), connecting(false), paired(false) {}
14 14
15 BluetoothDeviceInfo::BluetoothDeviceInfo(const BluetoothDeviceInfo& other) = 15 BluetoothDeviceInfo::BluetoothDeviceInfo(const BluetoothDeviceInfo& other) =
16 default; 16 default;
17 17
18 BluetoothDeviceInfo::~BluetoothDeviceInfo() {} 18 BluetoothDeviceInfo::~BluetoothDeviceInfo() {}
19 19
20 UpdateInfo::UpdateInfo()
21 : severity(UPDATE_NONE),
22 update_required(false),
23 factory_reset_required(false) {}
24
25 UpdateInfo::~UpdateInfo() {}
26
20 SystemTrayDelegate::SystemTrayDelegate() {} 27 SystemTrayDelegate::SystemTrayDelegate() {}
21 28
22 SystemTrayDelegate::~SystemTrayDelegate() {} 29 SystemTrayDelegate::~SystemTrayDelegate() {}
23 30
24 void SystemTrayDelegate::Initialize() {} 31 void SystemTrayDelegate::Initialize() {}
25 32
26 LoginStatus SystemTrayDelegate::GetUserLoginStatus() const { 33 LoginStatus SystemTrayDelegate::GetUserLoginStatus() const {
27 return LoginStatus::NOT_LOGGED_IN; 34 return LoginStatus::NOT_LOGGED_IN;
28 } 35 }
29 36
(...skipping 22 matching lines...) Expand all
52 } 59 }
53 60
54 bool SystemTrayDelegate::IsUserSupervised() const { 61 bool SystemTrayDelegate::IsUserSupervised() const {
55 return false; 62 return false;
56 } 63 }
57 64
58 bool SystemTrayDelegate::IsUserChild() const { 65 bool SystemTrayDelegate::IsUserChild() const {
59 return false; 66 return false;
60 } 67 }
61 68
69 void SystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
70 info->severity = UpdateInfo::UPDATE_NONE;
71 info->update_required = false;
72 info->factory_reset_required = false;
73 }
74
62 bool SystemTrayDelegate::ShouldShowSettings() const { 75 bool SystemTrayDelegate::ShouldShowSettings() const {
63 return false; 76 return false;
64 } 77 }
65 78
66 bool SystemTrayDelegate::ShouldShowNotificationTray() const { 79 bool SystemTrayDelegate::ShouldShowNotificationTray() const {
67 return false; 80 return false;
68 } 81 }
69 82
70 void SystemTrayDelegate::ShowEnterpriseInfo() {} 83 void SystemTrayDelegate::ShowEnterpriseInfo() {}
71 84
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 153
141 void SystemTrayDelegate::RemoveCustodianInfoTrayObserver( 154 void SystemTrayDelegate::RemoveCustodianInfoTrayObserver(
142 CustodianInfoTrayObserver* observer) {} 155 CustodianInfoTrayObserver* observer) {}
143 156
144 std::unique_ptr<SystemTrayItem> SystemTrayDelegate::CreateRotationLockTrayItem( 157 std::unique_ptr<SystemTrayItem> SystemTrayDelegate::CreateRotationLockTrayItem(
145 SystemTray* tray) { 158 SystemTray* tray) {
146 return nullptr; 159 return nullptr;
147 } 160 }
148 161
149 } // namespace ash 162 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_delegate.h ('k') | ash/common/system/tray/system_tray_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698