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

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

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: alphabetize (and rebase) Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/system_notifier.h ('k') | ash/system/tray/default_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/system_notifier.h" 5 #include "ash/system/system_notifier.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace ash { 9 namespace ash {
10 namespace system_notifier { 10 namespace system_notifier {
11 11
12 namespace { 12 namespace {
13 13
14 // See http://dev.chromium.org/chromium-os/chromiumos-design-docs/ 14 // See http://dev.chromium.org/chromium-os/chromiumos-design-docs/
15 // system-notifications for the reasoning. 15 // system-notifications for the reasoning.
16 const char* kAlwaysShownNotifierIds[] = { 16 const char* kAlwaysShownNotifierIds[] = {
17 kNotifierDisplay, 17 kNotifierDisplay,
18 kNotifierDisplayError, 18 kNotifierDisplayError,
19 kNotifierNetworkError, 19 kNotifierNetworkError,
20 kNotifierPower, 20 kNotifierPower,
21 NULL 21 NULL
22 }; 22 };
23 23
24 const char* kAshSystemNotifiers[] = { 24 const char* kAshSystemNotifiers[] = {
25 kNotifierDisplay, 25 kNotifierDisplay,
26 kNotifierDisplayResolutionChange, 26 kNotifierDisplayResolutionChange,
27 kNotifierDisplayError, 27 kNotifierDisplayError,
Pam (message me for reviews) 2014/07/17 16:48:47 Also this one (E < R)
Marc Treib 2014/07/18 08:07:06 Done.
28 kNotifierLocale, 28 kNotifierLocale,
29 kNotifierLocallyManagedUser,
30 kNotifierMultiProfileFirstRun, 29 kNotifierMultiProfileFirstRun,
31 kNotifierNetwork, 30 kNotifierNetwork,
32 kNotifierNetworkError, 31 kNotifierNetworkError,
33 kNotifierNetworkPortalDetector, 32 kNotifierNetworkPortalDetector,
34 kNotifierScreenshot, 33 kNotifierScreenshot,
35 kNotifierScreenCapture, 34 kNotifierScreenCapture,
36 kNotifierScreenShare, 35 kNotifierScreenShare,
37 kNotifierSessionLengthTimeout, 36 kNotifierSessionLengthTimeout,
37 kNotifierSupervisedUser,
38 kNotifierPower, 38 kNotifierPower,
39 kNotifierBluetooth, 39 kNotifierBluetooth,
Pam (message me for reviews) 2014/07/17 16:48:47 These last two too. And I think it's worth adding
Marc Treib 2014/07/18 08:07:06 Done.
40 NULL 40 NULL
41 }; 41 };
42 42
43 bool MatchSystemNotifierId(const message_center::NotifierId& notifier_id, 43 bool MatchSystemNotifierId(const message_center::NotifierId& notifier_id,
44 const char* id_list[]) { 44 const char* id_list[]) {
45 if (notifier_id.type != message_center::NotifierId::SYSTEM_COMPONENT) 45 if (notifier_id.type != message_center::NotifierId::SYSTEM_COMPONENT)
46 return false; 46 return false;
47 47
48 for (size_t i = 0; id_list[i] != NULL; ++i) { 48 for (size_t i = 0; id_list[i] != NULL; ++i) {
49 if (notifier_id.id == id_list[i]) 49 if (notifier_id.id == id_list[i])
50 return true; 50 return true;
51 } 51 }
52 return false; 52 return false;
53 } 53 }
54 54
55 } // namespace 55 } // namespace
56 56
57 const char kNotifierBluetooth[] = "ash.bluetooth"; 57 const char kNotifierBluetooth[] = "ash.bluetooth";
58 const char kNotifierDisplay[] = "ash.display"; 58 const char kNotifierDisplay[] = "ash.display";
59 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; 59 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change";
60 const char kNotifierDisplayError[] = "ash.display.error"; 60 const char kNotifierDisplayError[] = "ash.display.error";
Pam (message me for reviews) 2014/07/17 16:48:47 E < R
Marc Treib 2014/07/18 08:07:06 Done.
61 const char kNotifierLocale[] = "ash.locale"; 61 const char kNotifierLocale[] = "ash.locale";
62 const char kNotifierLocallyManagedUser[] = "ash.locally-managed-user";
63 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; 62 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run";
64 const char kNotifierNetwork[] = "ash.network"; 63 const char kNotifierNetwork[] = "ash.network";
65 const char kNotifierNetworkError[] = "ash.network.error"; 64 const char kNotifierNetworkError[] = "ash.network.error";
66 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector"; 65 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector";
67 const char kNotifierPower[] = "ash.power"; 66 const char kNotifierPower[] = "ash.power";
68 const char kNotifierScreenshot[] = "ash.screenshot"; 67 const char kNotifierScreenshot[] = "ash.screenshot";
69 const char kNotifierScreenCapture[] = "ash.screen-capture"; 68 const char kNotifierScreenCapture[] = "ash.screen-capture";
70 const char kNotifierScreenShare[] = "ash.screen-share"; 69 const char kNotifierScreenShare[] = "ash.screen-share";
71 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout"; 70 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout";
71 const char kNotifierSupervisedUser[] = "ash.locally-managed-user";
72 72
73 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) { 73 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) {
74 return MatchSystemNotifierId(notifier_id, kAlwaysShownNotifierIds); 74 return MatchSystemNotifierId(notifier_id, kAlwaysShownNotifierIds);
75 } 75 }
76 76
77 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { 77 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) {
78 return MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); 78 return MatchSystemNotifierId(notifier_id, kAshSystemNotifiers);
79 } 79 }
80 80
81 } // namespace system_notifier 81 } // namespace system_notifier
82 } // namespace ash 82 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/system_notifier.h ('k') | ash/system/tray/default_system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698