Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2961)

Unified Diff: athena/athena.gyp

Issue 311113005: AppModelBuilder to athena. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 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 | « athena/activity/public/activity_factory.h ('k') | athena/content/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index bffdd8acfe44c80fc08dd2f85c7863671e78d9cf..b6ecb875c4f655eb00567d0d3875387ef7cd6e3b 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -38,6 +38,7 @@
'home/app_list_view_delegate.cc',
'home/app_list_view_delegate.h',
'home/home_card_impl.cc',
+ 'home/public/app_model_builder.h',
'home/public/home_card.h',
'input/public/input_manager.h',
'input/public/accelerator_manager.h',
@@ -62,6 +63,7 @@
'dependencies': [
'athena_lib',
'../content/content.gyp:content_browser',
+ '../ui/app_list/app_list.gyp:app_list',
'../ui/views/controls/webview/webview.gyp:webview',
'../skia/skia.gyp:skia',
],
@@ -70,7 +72,9 @@
],
'sources': [
'content/public/content_activity_factory.h',
+ 'content/public/content_app_model_builder.h',
'content/content_activity_factory.cc',
+ 'content/content_app_model_builder.cc',
'content/web_activity.h',
'content/web_activity.cc',
],
@@ -83,6 +87,7 @@
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../ui/accessibility/accessibility.gyp:ax_gen',
+ '../ui/app_list/app_list.gyp:app_list',
'../ui/aura/aura.gyp:aura_test_support',
'../ui/base/ui_base.gyp:ui_base_test_support',
'../ui/compositor/compositor.gyp:compositor_test_support',
@@ -104,6 +109,8 @@
'test/sample_activity.h',
'test/sample_activity_factory.cc',
'test/sample_activity_factory.h',
+ 'test/test_app_model_builder.cc',
+ 'test/test_app_model_builder.h',
],
},
{
« no previous file with comments | « athena/activity/public/activity_factory.h ('k') | athena/content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698