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

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

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oshima's comments Created 5 years, 3 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 | « ash/shell_delegate.h ('k') | 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 kNotifierBattery[]; 17 ASH_EXPORT extern const char kNotifierBattery[];
18 ASH_EXPORT extern const char kNotifierBluetooth[]; 18 ASH_EXPORT extern const char kNotifierBluetooth[];
19 ASH_EXPORT extern const char kNotifierDeprecatedAccelerator[];
19 ASH_EXPORT extern const char kNotifierDisplay[]; 20 ASH_EXPORT extern const char kNotifierDisplay[];
20 ASH_EXPORT extern const char kNotifierDisplayResolutionChange[]; 21 ASH_EXPORT extern const char kNotifierDisplayResolutionChange[];
21 ASH_EXPORT extern const char kNotifierDisplayError[]; 22 ASH_EXPORT extern const char kNotifierDisplayError[];
22 ASH_EXPORT extern const char kNotifierLocale[]; 23 ASH_EXPORT extern const char kNotifierLocale[];
23 ASH_EXPORT extern const char kNotifierMultiProfileFirstRun[]; 24 ASH_EXPORT extern const char kNotifierMultiProfileFirstRun[];
24 ASH_EXPORT extern const char kNotifierNetwork[]; 25 ASH_EXPORT extern const char kNotifierNetwork[];
25 ASH_EXPORT extern const char kNotifierNetworkError[]; 26 ASH_EXPORT extern const char kNotifierNetworkError[];
26 ASH_EXPORT extern const char kNotifierNetworkPortalDetector[]; 27 ASH_EXPORT extern const char kNotifierNetworkPortalDetector[];
27 ASH_EXPORT extern const char kNotifierPower[]; 28 ASH_EXPORT extern const char kNotifierPower[];
28 ASH_EXPORT extern const char kNotifierScreenshot[]; 29 ASH_EXPORT extern const char kNotifierScreenshot[];
29 ASH_EXPORT extern const char kNotifierScreenCapture[]; 30 ASH_EXPORT extern const char kNotifierScreenCapture[];
30 ASH_EXPORT extern const char kNotifierScreenShare[]; 31 ASH_EXPORT extern const char kNotifierScreenShare[];
31 ASH_EXPORT extern const char kNotifierSessionLengthTimeout[]; 32 ASH_EXPORT extern const char kNotifierSessionLengthTimeout[];
32 ASH_EXPORT extern const char kNotifierSupervisedUser[]; 33 ASH_EXPORT extern const char kNotifierSupervisedUser[];
33 34
34 // Returns true if notifications from |notifier_id| should always appear as 35 // Returns true if notifications from |notifier_id| should always appear as
35 // popups. "Always appear" means the popups should appear even in login screen, 36 // popups. "Always appear" means the popups should appear even in login screen,
36 // lock screen, or fullscreen state. 37 // lock screen, or fullscreen state.
37 ASH_EXPORT bool ShouldAlwaysShowPopups( 38 ASH_EXPORT bool ShouldAlwaysShowPopups(
38 const message_center::NotifierId& notifier_id); 39 const message_center::NotifierId& notifier_id);
39 40
40 // Returns true if |notifier_id| is the system notifier from Ash. 41 // Returns true if |notifier_id| is the system notifier from Ash.
41 ASH_EXPORT bool IsAshSystemNotifier( 42 ASH_EXPORT bool IsAshSystemNotifier(
42 const message_center::NotifierId& notifier_id); 43 const message_center::NotifierId& notifier_id);
43 44
44 } // namespace system_notifier 45 } // namespace system_notifier
45 } // namespace ash 46 } // namespace ash
46 47
47 #endif // ASH_SYSTEM_SYSTEM_NOTIFIER_H_ 48 #endif // ASH_SYSTEM_SYSTEM_NOTIFIER_H_
OLDNEW
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/system/system_notifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698