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

Side by Side Diff: ui/notifications/notification_types.h

Issue 12212037: Update notifications API after review. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflict resolved Created 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_NOTIFICATIONS_NOTIFICATION_TYPES_H_ 5 #ifndef UI_NOTIFICATIONS_NOTIFICATION_TYPES_H_
6 #define UI_NOTIFICATIONS_NOTIFICATION_TYPES_H_ 6 #define UI_NOTIFICATIONS_NOTIFICATION_TYPES_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/base/ui_export.h" 10 #include "ui/base/ui_export.h"
(...skipping 24 matching lines...) Expand all
35 }; 35 };
36 36
37 enum NotificationPriority { 37 enum NotificationPriority {
38 MIN_PRIORITY = -2, 38 MIN_PRIORITY = -2,
39 LOW_PRIORITY = -1, 39 LOW_PRIORITY = -1,
40 DEFAULT_PRIORITY = 0, 40 DEFAULT_PRIORITY = 0,
41 HIGH_PRIORITY = 1, 41 HIGH_PRIORITY = 1,
42 MAX_PRIORITY = 2, 42 MAX_PRIORITY = 2,
43 }; 43 };
44 44
45 UI_EXPORT NotificationType StringToNotificationType(std::string& string_type);
46
47 } // namespace notifications 45 } // namespace notifications
48 46
49 } // namespace ui 47 } // namespace ui
50 48
51 #endif // UI_NOTIFICATIONS_NOTIFICATION_TYPES_H_ 49 #endif // UI_NOTIFICATIONS_NOTIFICATION_TYPES_H_
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/api_test/notification/galore/app/model.js ('k') | ui/notifications/notification_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698