Index: athena/athena.gyp |
diff --git a/athena/athena.gyp b/athena/athena.gyp |
index f8ef9ccc98381f2d8357772e4fde925d53c46462..fdc9685490dacdc9adacc3406fc68cb8836b6cdd 100644 |
--- a/athena/athena.gyp |
+++ b/athena/athena.gyp |
@@ -40,6 +40,7 @@ |
'activity/public/activity.h', |
'activity/public/activity_factory.h', |
'activity/public/activity_manager.h', |
+ 'activity/public/activity_manager_observer.h', |
'activity/public/activity_view_manager.h', |
'activity/public/activity_view_model.h', |
'athena_export.h', |
@@ -133,6 +134,11 @@ |
'content/web_activity.cc', |
'content/web_activity.h', |
'content/web_contents_view_delegate_factory_impl.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', |
'virtual_keyboard/virtual_keyboard_manager_impl.cc', |
], |
@@ -146,6 +152,8 @@ |
'sources': [ |
'content/delegate/app_content_control_delegate_impl.cc', |
'content/public/app_content_control_delegate.h', |
+ 'resource_manager/delegate/resource_manager_delegate.cc', |
+ 'resource_manager/public/resource_manager_delegate.h', |
Jun Mukai
2014/08/27 16:57:48
public/resource_manager_delegate.h already appears
Mr4D (OOO till 08-26)
2014/08/27 18:09:38
Done.
|
], |
}, |
{ |
@@ -170,6 +178,7 @@ |
], |
'sources': [ |
'content/public/app_content_control_delegate.h', |
+ 'resource_manager/public/resource_manager_delegate.h', |
Jun Mukai
2014/08/27 16:57:48
ditto -- this file already appears in athena_conte
Mr4D (OOO till 08-26)
2014/08/27 18:09:38
Done.
|
'test/athena_test_base.cc', |
'test/athena_test_base.h', |
'test/athena_test_helper.cc', |
@@ -181,6 +190,7 @@ |
'test/test_app_content_control_delegate_impl.cc', |
'test/test_app_model_builder.cc', |
'test/test_app_model_builder.h', |
+ 'test/test_resource_manager_delegate.cc', |
'test/test_screen_manager_delegate.cc', |
'test/test_screen_manager_delegate.h', |
'wm/test/window_manager_impl_test_api.cc', |
@@ -204,6 +214,8 @@ |
'content/app_activity_unittest.cc', |
'home/home_card_unittest.cc', |
'input/accelerator_manager_unittest.cc', |
+ 'resource_manager/memory_pressure_notifier_unittest.cc', |
+ 'resource_manager/resource_manager_unittest.cc', |
'screen/screen_manager_unittest.cc', |
'test/athena_unittests.cc', |
'wm/split_view_controller_unittest.cc', |