chrome/test/data/extensions/api_test/notifications/galore/app/controller.js - Issue 12313115: Take notification API out of experimental.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/data/extensions/api_test/notifications/galore/app/controller.js

Issue 12313115: Take notification API out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict. Created 7 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/test/data/extensions/api_test/notifications/api/events/manifest.json ('k') | chrome/test/data/extensions/api_test/notifications/galore/app/images/Image1-300x225.jpg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/data/extensions/api_test/notifications/galore/app/controller.js

diff --git a/chrome/test/data/extensions/api_test/notification/galore/app/controller.js b/chrome/test/data/extensions/api_test/notifications/galore/app/controller.js

similarity index 90%

rename from chrome/test/data/extensions/api_test/notification/galore/app/controller.js

rename to chrome/test/data/extensions/api_test/notifications/galore/app/controller.js

index 3a4d95cb5708a36c9d1aceb3c9dcde3020122838..a9a00d1cfcfe405e41bf63cc974f71600eef1537 100644

--- a/chrome/test/data/extensions/api_test/notification/galore/app/controller.js

+++ b/chrome/test/data/extensions/api_test/notifications/galore/app/controller.js

@@ -15,7 +15,6 @@ Galore.controller = {

controller.prefix = chrome.runtime.getURL('').slice(0, -1);

controller.view = Galore.view.create(this.prepare_.bind(controller));

controller.listen_('onDisplayed');

- controller.listen_('onError');

controller.listen_('onClosed');

controller.listen_('onClicked');

controller.listen_('onButtonClicked');

@@ -25,7 +24,7 @@ Galore.controller = {

/** @private */

listen_: function(event) {

var listener = this.event_.bind(this, event);

- chrome.experimental.notification[event].addListener(listener);

+ chrome.notifications[event].addListener(listener);

/** @private */

@@ -52,15 +51,15 @@ Galore.controller = {

var id = this.id_();

var priority = this.view.getPriority();

var expanded = this.expand_(options, type, priority);

- if (chrome.experimental.notification.create) {

- chrome.experimental.notification.create(id, expanded, function() {});

+ if (chrome.notifications.create) {

+ chrome.notifications.create(id, expanded, function() {});

} else {

expanded.replaceId = id;

delete expanded.buttonOneIconUrl;

delete expanded.buttonOneTitle;

delete expanded.buttonTwoIconUrl;

delete expanded.buttonTwoTitle;

- chrome.experimental.notification.show(expanded, function() {});

+ chrome.notifications.show(expanded, function() {});

}

this.event_('create', id, 'priority: ' + priority);