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

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

Issue 614363002: Added Aura notification that relaunch and powerwash is required in case of downgrade. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactoring of SystemTrayDelegate(Windows|Linux) is delayed. Created 6 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/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage() 84 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage()
85 const { 85 const {
86 return base::string16(); 86 return base::string16();
87 } 87 }
88 88
89 bool DefaultSystemTrayDelegate::IsUserSupervised() const { 89 bool DefaultSystemTrayDelegate::IsUserSupervised() const {
90 return false; 90 return false;
91 } 91 }
92 92
93 bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const { 93 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
94 return true; 94 DCHECK(info);
95 info->severity = UpdateInfo::UPDATE_NORMAL;
96 info->update_required = true;
97 info->factory_reset_required = false;
95 } 98 }
96 99
97 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const { 100 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const {
98 return base::k24HourClock; 101 return base::k24HourClock;
99 } 102 }
100 103
101 void DefaultSystemTrayDelegate::ShowSettings() { 104 void DefaultSystemTrayDelegate::ShowSettings() {
102 } 105 }
103 106
104 bool DefaultSystemTrayDelegate::ShouldShowSettings() { 107 bool DefaultSystemTrayDelegate::ShouldShowSettings() {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { 285 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
283 return false; 286 return false;
284 } 287 }
285 288
286 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( 289 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
287 const std::string& user_id) { 290 const std::string& user_id) {
288 return NULL; 291 return NULL;
289 } 292 }
290 293
291 } // namespace ash 294 } // 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