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

Side by Side Diff: ash/common/system/system_notifier.cc

Issue 2128053002: Implements the feature notification for Quick Unlock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Implements the feature notification for Quick Unlock Created 4 years, 5 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/system_notifier.h" 5 #include "ash/common/system/system_notifier.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 #if defined(OS_CHROMEOS) 9 #if defined(OS_CHROMEOS)
10 #include "ui/chromeos/network/network_state_notifier.h" 10 #include "ui/chromeos/network/network_state_notifier.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 const char kNotifierDisk[] = "ash.disk"; 70 const char kNotifierDisk[] = "ash.disk";
71 const char kNotifierDisplay[] = "ash.display"; 71 const char kNotifierDisplay[] = "ash.display";
72 const char kNotifierDisplayError[] = "ash.display.error"; 72 const char kNotifierDisplayError[] = "ash.display.error";
73 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; 73 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change";
74 const char kNotifierDualRole[] = "ash.dual-role"; 74 const char kNotifierDualRole[] = "ash.dual-role";
75 const char kNotifierHats[] = "ash.hats"; 75 const char kNotifierHats[] = "ash.hats";
76 const char kNotifierLocale[] = "ash.locale"; 76 const char kNotifierLocale[] = "ash.locale";
77 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; 77 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run";
78 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector"; 78 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector";
79 const char kNotifierPower[] = "ash.power"; 79 const char kNotifierPower[] = "ash.power";
80 const char kNotifierQuickUnlock[] = "ash.quickunlock";
80 const char kNotifierScreenshot[] = "ash.screenshot"; 81 const char kNotifierScreenshot[] = "ash.screenshot";
81 const char kNotifierScreenCapture[] = "ash.screen-capture"; 82 const char kNotifierScreenCapture[] = "ash.screen-capture";
82 const char kNotifierScreenShare[] = "ash.screen-share"; 83 const char kNotifierScreenShare[] = "ash.screen-share";
83 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout"; 84 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout";
84 const char kNotifierSupervisedUser[] = "ash.locally-managed-user"; 85 const char kNotifierSupervisedUser[] = "ash.locally-managed-user";
85 const char kNotifierWebUsb[] = "ash.webusb"; 86 const char kNotifierWebUsb[] = "ash.webusb";
86 87
87 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) { 88 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) {
88 return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds); 89 return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds);
89 } 90 }
90 91
91 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { 92 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) {
92 return ShouldAlwaysShowPopups(notifier_id) || 93 return ShouldAlwaysShowPopups(notifier_id) ||
93 MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); 94 MatchSystemNotifierId(notifier_id, kAshSystemNotifiers);
94 } 95 }
95 96
96 } // namespace system_notifier 97 } // namespace system_notifier
97 } // namespace ash 98 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/system_notifier.h ('k') | chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698