chrome/chrome_browser_extensions.gypi - Issue 12680004: Remove chrome/ code to handle App Notifications

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/chrome_browser_extensions.gypi

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflicts. 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

Index: chrome/chrome_browser_extensions.gypi

diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi

index 633eeca606a758891041ffe00324a4c39cb6dc70..61214bc3f7d9c8af8fae5036b3852c42df1544ff 100644

--- a/chrome/chrome_browser_extensions.gypi

+++ b/chrome/chrome_browser_extensions.gypi

@@ -76,8 +76,6 @@

'browser/extensions/api/alarms/alarm_manager.h',

'browser/extensions/api/alarms/alarms_api.cc',

'browser/extensions/api/alarms/alarms_api.h',

- 'browser/extensions/api/app/app_api.cc',

- 'browser/extensions/api/app/app_api.h',

'browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc',

'browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h',

'browser/extensions/api/app_runtime/app_runtime_api.cc',

@@ -463,19 +461,6 @@

'browser/extensions/app_icon_loader.h',

'browser/extensions/app_icon_loader_impl.cc',

'browser/extensions/app_icon_loader_impl.h',

- 'browser/extensions/app_notification.cc',

- 'browser/extensions/app_notification.h',

- 'browser/extensions/app_notification_manager.cc',

- 'browser/extensions/app_notification_manager.h',

- 'browser/extensions/app_notification_storage.cc',

- 'browser/extensions/app_notification_storage.h',

- 'browser/extensions/app_notify_channel_setup.cc',

- 'browser/extensions/app_notify_channel_setup.h',

- 'browser/extensions/app_notify_channel_ui.h',

- 'browser/extensions/app_notify_channel_ui_impl.cc',

- 'browser/extensions/app_notify_channel_ui_impl.h',

- 'browser/extensions/app_notify_channel_ui_android.cc',

- 'browser/extensions/app_notify_channel_ui_android.h',

'browser/extensions/app_sync_bundle.cc',

'browser/extensions/app_sync_bundle.h',

'browser/extensions/app_sync_data.cc',

@@ -926,8 +911,6 @@

'browser/extensions/extension_tab_util_android.cc',

'sources!': [

- 'browser/extensions/app_notify_channel_ui_impl.cc',

- 'browser/extensions/app_notify_channel_ui_impl.h',

'browser/extensions/extension_error_ui_default.cc',

'browser/extensions/extension_error_ui_default.h',

'browser/extensions/extension_tab_util.cc',

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »