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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_win.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 | « chrome/browser/ui/ash/system_tray_delegate_utils.cc ('k') | chrome/browser/upgrade_detector.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 (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 "chrome/browser/ui/ash/system_tray_delegate_win.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "ash/system/tray/system_tray.h" 11 #include "ash/system/tray/system_tray.h"
12 #include "ash/system/tray/system_tray_delegate.h" 12 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
14 #include "ash/volume_control_delegate.h" 14 #include "ash/volume_control_delegate.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/lifetime/application_lifetime.h" 18 #include "chrome/browser/lifetime/application_lifetime.h"
19 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
20 #include "chrome/browser/ui/chrome_pages.h" 21 #include "chrome/browser/ui/chrome_pages.h"
21 #include "chrome/browser/ui/host_desktop.h" 22 #include "chrome/browser/ui/host_desktop.h"
22 #include "chrome/browser/upgrade_detector.h" 23 #include "chrome/browser/upgrade_detector.h"
23 #include "chrome/grit/locale_settings.h" 24 #include "chrome/grit/locale_settings.h"
24 #include "content/public/browser/notification_observer.h" 25 #include "content/public/browser/notification_observer.h"
25 #include "content/public/browser/notification_service.h" 26 #include "content/public/browser/notification_service.h"
26 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
27 28
28 namespace { 29 namespace {
29 30
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 } 81 }
81 82
82 virtual const base::string16 GetSupervisedUserMessage() const override { 83 virtual const base::string16 GetSupervisedUserMessage() const override {
83 return base::string16(); 84 return base::string16();
84 } 85 }
85 86
86 virtual bool IsUserSupervised() const override { 87 virtual bool IsUserSupervised() const override {
87 return false; 88 return false;
88 } 89 }
89 90
90 virtual bool SystemShouldUpgrade() const override { 91 virtual void GetSystemUpdateInfo(ash::UpdateInfo* info) const override {
91 return UpgradeDetector::GetInstance()->notify_upgrade(); 92 GetUpdateInfo(UpgradeDetector::GetInstance(), info);
92 } 93 }
93 94
94 virtual base::HourClockType GetHourClockType() const override { 95 virtual base::HourClockType GetHourClockType() const override {
95 return clock_type_; 96 return clock_type_;
96 } 97 }
97 98
98 virtual void ShowSettings() override { 99 virtual void ShowSettings() override {
99 } 100 }
100 101
101 virtual bool ShouldShowSettings() override { 102 virtual bool ShouldShowSettings() override {
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? 293 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ?
293 base::k24HourClock : base::k12HourClock; 294 base::k24HourClock : base::k12HourClock;
294 GetSystemTrayNotifier()->NotifyDateFormatChanged(); 295 GetSystemTrayNotifier()->NotifyDateFormatChanged();
295 } 296 }
296 297
297 // content::NotificationObserver implementation. 298 // content::NotificationObserver implementation.
298 virtual void Observe(int type, 299 virtual void Observe(int type,
299 const content::NotificationSource& source, 300 const content::NotificationSource& source,
300 const content::NotificationDetails& details) override { 301 const content::NotificationDetails& details) override {
301 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { 302 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
302 UpgradeDetector* detector = 303 ash::UpdateInfo info;
303 content::Source<UpgradeDetector>(source).ptr(); 304 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info);
304 ash::UpdateObserver::UpdateSeverity severity = 305 GetSystemTrayNotifier()->NotifyUpdateRecommended(info);
305 ash::UpdateObserver::UPDATE_NORMAL;
306 switch (detector->upgrade_notification_stage()) {
307 case UpgradeDetector::UPGRADE_ANNOYANCE_CRITICAL:
308 case UpgradeDetector::UPGRADE_ANNOYANCE_SEVERE:
309 severity = ash::UpdateObserver::UPDATE_SEVERE_RED;
310 break;
311 case UpgradeDetector::UPGRADE_ANNOYANCE_HIGH:
312 severity = ash::UpdateObserver::UPDATE_HIGH_ORANGE;
313 break;
314 case UpgradeDetector::UPGRADE_ANNOYANCE_ELEVATED:
315 severity = ash::UpdateObserver::UPDATE_LOW_GREEN;
316 break;
317 case UpgradeDetector::UPGRADE_ANNOYANCE_LOW:
318 case UpgradeDetector::UPGRADE_ANNOYANCE_NONE:
319 severity = ash::UpdateObserver::UPDATE_NORMAL;
320 break;
321 }
322 GetSystemTrayNotifier()->NotifyUpdateRecommended(severity);
323 } else { 306 } else {
324 NOTREACHED(); 307 NOTREACHED();
325 } 308 }
326 } 309 }
327 310
328 scoped_ptr<content::NotificationRegistrar> registrar_; 311 scoped_ptr<content::NotificationRegistrar> registrar_;
329 base::HourClockType clock_type_; 312 base::HourClockType clock_type_;
330 313
331 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); 314 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin);
332 }; 315 };
333 316
334 } // namespace 317 } // namespace
335 318
336 319
337 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { 320 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() {
338 return new SystemTrayDelegateWin(); 321 return new SystemTrayDelegateWin();
339 } 322 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_utils.cc ('k') | chrome/browser/upgrade_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698