diff options
| author | dharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 22:18:26 +0000 |
|---|---|---|
| committer | dharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 22:18:26 +0000 |
| commit | 59c4d5358e6092d82e59f967ef249ecb2526b3e0 (patch) | |
| tree | 6489a834dff2d16fca6dd8c3d76b86e933c5d3e3 /chrome | |
| parent | 8349a2017892645867f33dac308f2a47e0e6d4fe (diff) | |
| download | chromium_src-59c4d5358e6092d82e59f967ef249ecb2526b3e0.zip chromium_src-59c4d5358e6092d82e59f967ef249ecb2526b3e0.tar.gz chromium_src-59c4d5358e6092d82e59f967ef249ecb2526b3e0.tar.bz2 | |
In experimental.notification.show() API: "notificationType" -> "type".
BUG=NONE
Review URL: https://chromiumcodereview.appspot.com/11299090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/api/notification/notification_api.cc b/chrome/browser/extensions/api/notification/notification_api.cc index 4d3e1d4..a873bce 100644 --- a/chrome/browser/extensions/api/notification/notification_api.cc +++ b/chrome/browser/extensions/api/notification/notification_api.cc @@ -94,7 +94,7 @@ bool NotificationShowFunction::RunImpl() { event_notifier_ = CreateEventNotifier(src_id_); ui::notifications::NotificationType type = - ui::notifications::StringToNotificationType(options->notification_type); + ui::notifications::StringToNotificationType(options->type); GURL icon_url(UTF8ToUTF16(options->icon_url)); string16 title(UTF8ToUTF16(options->title)); string16 message(UTF8ToUTF16(options->message)); diff --git a/chrome/browser/extensions/api/notification/notification_apitest.cc b/chrome/browser/extensions/api/notification/notification_apitest.cc index e919b40..0eb6776 100644 --- a/chrome/browser/extensions/api/notification/notification_apitest.cc +++ b/chrome/browser/extensions/api/notification/notification_apitest.cc @@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(NotificationApiTest, TestSimpleNotification) { scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult( notification_show_function, "[{" - "\"notificationType\": \"simple\"," + "\"type\": \"simple\"," "\"iconUrl\": \"http://www.google.com/intl/en/chrome/assets/" "common/images/chrome_logo_2x.png\"," "\"title\": \"Attention!\"," @@ -59,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(NotificationApiTest, TestBaseFormatNotification) { scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult( notification_show_function, "[{" - "\"notificationType\": \"base\"," + "\"type\": \"base\"," "\"iconUrl\": \"http://www.google.com/intl/en/chrome/assets/" "common/images/chrome_logo_2x.png\"," "\"title\": \"Attention!\"," @@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(NotificationApiTest, TestMultipleItemNotification) { scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult( notification_show_function, "[{" - "\"notificationType\": \"multiple\"," + "\"type\": \"multiple\"," "\"iconUrl\": \"https://code.google.com/p/chromium/logo\"," "\"title\": \"Multiple Item Notification Title\"," "\"message\": \"Multiple item notification message.\"," diff --git a/chrome/common/extensions/api/experimental_notification.idl b/chrome/common/extensions/api/experimental_notification.idl index 4184d8e..f34e395 100644 --- a/chrome/common/extensions/api/experimental_notification.idl +++ b/chrome/common/extensions/api/experimental_notification.idl @@ -8,7 +8,7 @@ // // simple: icon, title, message // base: our MVP, with two buttons, expanded text, etc. TEMPORARY! - DOMString notificationType; + DOMString type; // Sender's avatar, app icon, or a thumbnail for image notifications. DOMString iconUrl; |