chrome/common/extensions/api/api.gyp - 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/common/extensions/api/api.gyp

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/common/extensions/api/_permission_features.json ('k') | chrome/common/extensions/api/experimental_notification.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/api.gyp

diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp

index 62e9a2cc6c5fdfe11f348fee51d7cf41d4c6696e..3ffa558b610fd70f62a8a98ab861ac1c367538fb 100644

--- a/chrome/common/extensions/api/api.gyp

+++ b/chrome/common/extensions/api/api.gyp

@@ -25,8 +25,8 @@

'app_window.idl',

'autotest_private.idl',

'bluetooth.idl',

- 'bookmarks.json',

'bookmark_manager_private.json',

+ 'bookmarks.json',

'chromeos_info_private.json',

'cloud_print_private.json',

'content_settings.json',

@@ -48,7 +48,6 @@

'experimental_idltest.idl',

'experimental_infobars.json',

'experimental_media_galleries.idl',

- 'experimental_notification.idl',

'experimental_power.json',

'experimental_record.json',

'experimental_system_info_cpu.idl',

@@ -67,8 +66,9 @@

'media_galleries_private.idl',

'media_player_private.json',

'metrics_private.json',

- 'omnibox.json',

'networking_private.json',

+ 'notifications.idl',

+ 'omnibox.json',

'page_capture.json',

'page_launcher.idl',

'permissions.json',

@@ -89,10 +89,10 @@

'top_sites.json',

'usb.idl',

'wallpaper_private.json',

- 'webview.json',

'web_navigation.json',

'web_request.json',

'web_socket_proxy_private.json',

+ 'webview.json',

'windows.json',

'cc_dir': 'chrome/common/extensions/api',