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

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

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 | « no previous file | ash/system/system_notifier.cc » ('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 #ifndef ASH_SYSTEM_SYSTEM_NOTIFIER_H_ 5 #ifndef ASH_SYSTEM_SYSTEM_NOTIFIER_H_
6 #define ASH_SYSTEM_SYSTEM_NOTIFIER_H_ 6 #define ASH_SYSTEM_SYSTEM_NOTIFIER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ui/message_center/notifier_settings.h" 11 #include "ui/message_center/notifier_settings.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace system_notifier { 14 namespace system_notifier {
15 15
16 // The list of ash system notifier IDs. Alphabetical order. 16 // The list of ash system notifier IDs. Alphabetical order.
17 ASH_EXPORT extern const char kNotifierDisplay[]; 17 ASH_EXPORT extern const char kNotifierDisplay[];
18 ASH_EXPORT extern const char kNotifierDisplayResolutionChange[]; 18 ASH_EXPORT extern const char kNotifierDisplayResolutionChange[];
19 ASH_EXPORT extern const char kNotifierDisplayError[]; 19 ASH_EXPORT extern const char kNotifierDisplayError[];
20 ASH_EXPORT extern const char kNotifierLocale[]; 20 ASH_EXPORT extern const char kNotifierLocale[];
21 ASH_EXPORT extern const char kNotifierLocallyManagedUser[]; 21 ASH_EXPORT extern const char kNotifierLocallyManagedUser[];
22 ASH_EXPORT extern const char kNotifierMultiProfileFirstRun[]; 22 ASH_EXPORT extern const char kNotifierMultiProfileFirstRun[];
23 ASH_EXPORT extern const char kNotifierNetwork[]; 23 ASH_EXPORT extern const char kNotifierNetwork[];
24 ASH_EXPORT extern const char kNotifierNetworkError[]; 24 ASH_EXPORT extern const char kNotifierNetworkError[];
25 ASH_EXPORT extern const char kNotifierNetworkPortalDetector[];
25 ASH_EXPORT extern const char kNotifierScreenshot[]; 26 ASH_EXPORT extern const char kNotifierScreenshot[];
26 ASH_EXPORT extern const char kNotifierScreenCapture[]; 27 ASH_EXPORT extern const char kNotifierScreenCapture[];
27 ASH_EXPORT extern const char kNotifierScreenShare[]; 28 ASH_EXPORT extern const char kNotifierScreenShare[];
28 ASH_EXPORT extern const char kNotifierSessionLengthTimeout[]; 29 ASH_EXPORT extern const char kNotifierSessionLengthTimeout[];
29 ASH_EXPORT extern const char kNotifierPower[]; 30 ASH_EXPORT extern const char kNotifierPower[];
30 31
31 // Returns true if notifications from |notifier_id| should always appear as 32 // Returns true if notifications from |notifier_id| should always appear as
32 // popups. "Always appear" means the popups should appear even in login screen, 33 // popups. "Always appear" means the popups should appear even in login screen,
33 // lock screen, or fullscreen state. 34 // lock screen, or fullscreen state.
34 ASH_EXPORT bool ShouldAlwaysShowPopups( 35 ASH_EXPORT bool ShouldAlwaysShowPopups(
35 const message_center::NotifierId& notifier_id); 36 const message_center::NotifierId& notifier_id);
36 37
37 // Returns true if |notifier_id| is the system notifier from Ash. 38 // Returns true if |notifier_id| is the system notifier from Ash.
38 ASH_EXPORT bool IsAshSystemNotifier( 39 ASH_EXPORT bool IsAshSystemNotifier(
39 const message_center::NotifierId& notifier_id); 40 const message_center::NotifierId& notifier_id);
40 41
41 } // namespace system_notifier 42 } // namespace system_notifier
42 } // namespace ash 43 } // namespace ash
43 44
44 #endif // ASH_SYSTEM_SYSTEM_NOTIFIER_H_ 45 #endif // ASH_SYSTEM_SYSTEM_NOTIFIER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/system_notifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698