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

Side by Side Diff: ui/message_center/notifier_settings.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 | « ui/message_center/notification.cc ('k') | ui/message_center/notifier_settings.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_ 5 #ifndef UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_
6 #define UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_ 6 #define UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 FRIEND_TEST_ALL_PREFIXES(NotificationListTest, UnreadCountNoNegative); 79 FRIEND_TEST_ALL_PREFIXES(NotificationListTest, UnreadCountNoNegative);
80 FRIEND_TEST_ALL_PREFIXES(NotificationListTest, TestHasNotificationOfType); 80 FRIEND_TEST_ALL_PREFIXES(NotificationListTest, TestHasNotificationOfType);
81 81
82 // The default constructor which doesn't specify the notifier. Used for tests. 82 // The default constructor which doesn't specify the notifier. Used for tests.
83 NotifierId(); 83 NotifierId();
84 }; 84 };
85 85
86 // The struct to hold the information of notifiers. The information will be 86 // The struct to hold the information of notifiers. The information will be
87 // used by NotifierSettingsView. 87 // used by NotifierSettingsView.
88 struct MESSAGE_CENTER_EXPORT Notifier { 88 struct MESSAGE_CENTER_EXPORT Notifier {
89 Notifier(const NotifierId& notifier_id, const string16& name, bool enabled); 89 Notifier(const NotifierId& notifier_id,
90 const base::string16& name,
91 bool enabled);
90 ~Notifier(); 92 ~Notifier();
91 93
92 NotifierId notifier_id; 94 NotifierId notifier_id;
93 95
94 // The human-readable name of the notifier such like the extension name. 96 // The human-readable name of the notifier such like the extension name.
95 // It can be empty. 97 // It can be empty.
96 string16 name; 98 base::string16 name;
97 99
98 // True if the source is allowed to send notifications. True is default. 100 // True if the source is allowed to send notifications. True is default.
99 bool enabled; 101 bool enabled;
100 102
101 // The icon image of the notifier. The extension icon or favicon. 103 // The icon image of the notifier. The extension icon or favicon.
102 gfx::Image icon; 104 gfx::Image icon;
103 105
104 private: 106 private:
105 DISALLOW_COPY_AND_ASSIGN(Notifier); 107 DISALLOW_COPY_AND_ASSIGN(Notifier);
106 }; 108 };
107 109
108 struct MESSAGE_CENTER_EXPORT NotifierGroup { 110 struct MESSAGE_CENTER_EXPORT NotifierGroup {
109 NotifierGroup(const gfx::Image& icon, 111 NotifierGroup(const gfx::Image& icon,
110 const string16& name, 112 const base::string16& name,
111 const string16& login_info, 113 const base::string16& login_info,
112 size_t index); 114 size_t index);
113 ~NotifierGroup(); 115 ~NotifierGroup();
114 116
115 // Icon of a notifier group. 117 // Icon of a notifier group.
116 const gfx::Image icon; 118 const gfx::Image icon;
117 119
118 // Display name of a notifier group. 120 // Display name of a notifier group.
119 const string16 name; 121 const base::string16 name;
120 122
121 // More display information about the notifier group. 123 // More display information about the notifier group.
122 string16 login_info; 124 base::string16 login_info;
123 125
124 // Unique identifier for the notifier group so that they can be selected in 126 // Unique identifier for the notifier group so that they can be selected in
125 // the UI. 127 // the UI.
126 const size_t index; 128 const size_t index;
127 129
128 private: 130 private:
129 DISALLOW_COPY_AND_ASSIGN(NotifierGroup); 131 DISALLOW_COPY_AND_ASSIGN(NotifierGroup);
130 }; 132 };
131 133
132 // An observer class implemented by the view of the NotifierSettings to get 134 // An observer class implemented by the view of the NotifierSettings to get
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 189
188 // Called upon request for more information about a particular notifier. 190 // Called upon request for more information about a particular notifier.
189 virtual void OnNotifierAdvancedSettingsRequested( 191 virtual void OnNotifierAdvancedSettingsRequested(
190 const NotifierId& notifier_id, 192 const NotifierId& notifier_id,
191 const std::string* notification_id) = 0; 193 const std::string* notification_id) = 0;
192 }; 194 };
193 195
194 } // namespace message_center 196 } // namespace message_center
195 197
196 #endif // UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_ 198 #endif // UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_
OLDNEW
« no previous file with comments | « ui/message_center/notification.cc ('k') | ui/message_center/notifier_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698