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

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

Issue 171423005: Added in-session captive portal notification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deleted useless NotificaionDisplayed(). Created 6 years, 10 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') | chrome/app/chromeos_strings.grdp » ('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 {
(...skipping 11 matching lines...) Expand all
22 22
23 const char* kAshSystemNotifiers[] = { 23 const char* kAshSystemNotifiers[] = {
24 kNotifierDisplay, 24 kNotifierDisplay,
25 kNotifierDisplayResolutionChange, 25 kNotifierDisplayResolutionChange,
26 kNotifierDisplayError, 26 kNotifierDisplayError,
27 kNotifierLocale, 27 kNotifierLocale,
28 kNotifierLocallyManagedUser, 28 kNotifierLocallyManagedUser,
29 kNotifierMultiProfileFirstRun, 29 kNotifierMultiProfileFirstRun,
30 kNotifierNetwork, 30 kNotifierNetwork,
31 kNotifierNetworkError, 31 kNotifierNetworkError,
32 kNotifierNetworkPortalDetector,
32 kNotifierScreenshot, 33 kNotifierScreenshot,
33 kNotifierScreenCapture, 34 kNotifierScreenCapture,
34 kNotifierScreenShare, 35 kNotifierScreenShare,
35 kNotifierSessionLengthTimeout, 36 kNotifierSessionLengthTimeout,
36 kNotifierPower, 37 kNotifierPower,
37 NULL 38 NULL
38 }; 39 };
39 40
40 bool MatchSystemNotifierId(const message_center::NotifierId& notifier_id, 41 bool MatchSystemNotifierId(const message_center::NotifierId& notifier_id,
41 const char* id_list[]) { 42 const char* id_list[]) {
(...skipping 10 matching lines...) Expand all
52 } // namespace 53 } // namespace
53 54
54 const char kNotifierDisplay[] = "ash.display"; 55 const char kNotifierDisplay[] = "ash.display";
55 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; 56 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change";
56 const char kNotifierDisplayError[] = "ash.display.error"; 57 const char kNotifierDisplayError[] = "ash.display.error";
57 const char kNotifierLocale[] = "ash.locale"; 58 const char kNotifierLocale[] = "ash.locale";
58 const char kNotifierLocallyManagedUser[] = "ash.locally-managed-user"; 59 const char kNotifierLocallyManagedUser[] = "ash.locally-managed-user";
59 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; 60 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run";
60 const char kNotifierNetwork[] = "ash.network"; 61 const char kNotifierNetwork[] = "ash.network";
61 const char kNotifierNetworkError[] = "ash.network.error"; 62 const char kNotifierNetworkError[] = "ash.network.error";
63 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector";
62 const char kNotifierScreenshot[] = "ash.screenshot"; 64 const char kNotifierScreenshot[] = "ash.screenshot";
63 const char kNotifierScreenCapture[] = "ash.screen-capture"; 65 const char kNotifierScreenCapture[] = "ash.screen-capture";
64 const char kNotifierScreenShare[] = "ash.screen-share"; 66 const char kNotifierScreenShare[] = "ash.screen-share";
65 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout"; 67 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout";
66 const char kNotifierPower[] = "ash.power"; 68 const char kNotifierPower[] = "ash.power";
67 69
68 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) { 70 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) {
69 return MatchSystemNotifierId(notifier_id, kAlwaysShownNotifierIds); 71 return MatchSystemNotifierId(notifier_id, kAlwaysShownNotifierIds);
70 } 72 }
71 73
72 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { 74 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) {
73 return MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); 75 return MatchSystemNotifierId(notifier_id, kAshSystemNotifiers);
74 } 76 }
75 77
76 } // namespace system_notifier 78 } // namespace system_notifier
77 } // namespace ash 79 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/system_notifier.h ('k') | chrome/app/chromeos_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698