athena/athena.gyp - Issue 544953003: Supprot V2 app: step1

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: athena/athena.gyp

Issue 544953003: Supprot V2 app: step1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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: athena/athena.gyp

diff --git a/athena/athena.gyp b/athena/athena.gyp

index 88b2c8d46898cf1b5a01644aecc1e23a8b9b7331..16ccb70b6cac1a092b38eee97085e754dab583fa 100644

--- a/athena/athena.gyp

+++ b/athena/athena.gyp

@@ -148,19 +148,20 @@

'content/app_activity_registry.h',

'content/app_registry_impl.cc',

'content/content_activity_factory.cc',

- 'extensions/extension_app_model_builder.cc',

- 'content/public/app_registry.h',

'content/content_activity_factory.h',

+ 'content/public/app_registry.h',

'content/public/content_activity_factory_creator.h',

- 'extensions/public/extension_app_model_builder.h',

+ 'content/public/dialogs.h',

'content/public/web_contents_view_delegate_creator.h',

'content/render_view_context_menu_impl.cc',

'content/render_view_context_menu_impl.h',

'content/web_activity.cc',

'content/web_activity.h',

'content/web_contents_view_delegate_factory_impl.cc',

- 'extensions/public/extensions_delegate.h',

+ 'extensions/extension_app_model_builder.cc',

'extensions/extensions_delegate.cc',

+ 'extensions/public/extension_app_model_builder.h',

+ 'extensions/public/extensions_delegate.h',

'virtual_keyboard/public/virtual_keyboard_manager.h',

'virtual_keyboard/virtual_keyboard_manager_impl.cc',

@@ -173,8 +174,11 @@

'sources': [

'content/chrome/content_activity_factory.cc',

- 'extensions/chrome/athena_apps_client.h',

+ 'content/chrome/dialogs.cc',

+ 'extensions/chrome/athena_app_delegate.cc',

+ 'extensions/chrome/athena_app_delegate.h',

'extensions/chrome/athena_apps_client.cc',

+ 'extensions/chrome/athena_apps_client.h',

'extensions/chrome/extensions_delegate_impl.cc',

@@ -186,6 +190,7 @@

'sources': [

'content/shell/content_activity_factory.cc',

+ 'content/shell/dialogs.cc',

'content/shell/shell_app_activity.cc',

'content/shell/shell_app_activity.h',

'extensions/shell/extensions_delegate_impl.cc',

« no previous file with comments | « athena/activity/activity_frame_view.h ('k') | athena/content/chrome/DEPS » ('j') | no next file with comments »