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

Unified Diff: athena/athena.gyp

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments, 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
« no previous file with comments | « no previous file | athena/content/chrome/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 1b634f0238ff3a88ad13c7538c6f949dad3e3a0c..e333ec0479067862f4b9508e9c8b412ef555ab5d 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -75,6 +75,12 @@
'input/input_manager_impl.cc',
'input/public/accelerator_manager.h',
'input/public/input_manager.h',
+ 'resource_manager/delegate/resource_manager_delegate.cc',
+ 'resource_manager/memory_pressure_notifier.cc',
+ 'resource_manager/memory_pressure_notifier.h',
+ 'resource_manager/public/resource_manager.h',
+ 'resource_manager/public/resource_manager_delegate.h',
+ 'resource_manager/resource_manager_impl.cc',
'screen/public/screen_manager.h',
'screen/screen_accelerator_handler.cc',
'screen/screen_accelerator_handler.h',
@@ -153,17 +159,24 @@
'content/web_contents_view_delegate_factory_impl.cc',
'extensions/public/extensions_delegate.h',
'extensions/extensions_delegate.cc',
- 'resource_manager/memory_pressure_notifier.cc',
- 'resource_manager/memory_pressure_notifier.h',
- 'resource_manager/resource_manager_impl.cc',
- 'resource_manager/public/resource_manager.h',
- 'resource_manager/public/resource_manager_delegate.h',
'virtual_keyboard/public/virtual_keyboard_manager.h',
- 'resource_manager/resource_manager_impl.cc',
'virtual_keyboard/virtual_keyboard_manager_impl.cc',
],
},
{
+ 'target_name': 'athena_chrome_lib',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../chrome/chrome.gyp:browser_extensions',
+ ],
+ 'sources': [
+ 'content/chrome/content_activity_factory.cc',
+ 'extensions/chrome/athena_apps_client.h',
+ 'extensions/chrome/athena_apps_client.cc',
+ 'extensions/chrome/extensions_delegate_impl.cc',
+ ],
+ },
+ {
'target_name': 'athena_app_shell_lib',
'type': 'static_library',
'dependencies': [
@@ -174,7 +187,6 @@
'content/shell/shell_app_activity.cc',
'content/shell/shell_app_activity.h',
'extensions/shell/extensions_delegate_impl.cc',
- 'resource_manager/delegate/resource_manager_delegate.cc',
],
},
{
« no previous file with comments | « no previous file | athena/content/chrome/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698