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

Side by Side Diff: athena/athena.gyp

Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 22 matching lines...) Expand all
33 'activity/activity_factory.cc', 33 'activity/activity_factory.cc',
34 'activity/activity_manager_impl.cc', 34 'activity/activity_manager_impl.cc',
35 'activity/activity_view_manager_impl.cc', 35 'activity/activity_view_manager_impl.cc',
36 'activity/activity_frame_view.cc', 36 'activity/activity_frame_view.cc',
37 'activity/activity_frame_view.h', 37 'activity/activity_frame_view.h',
38 'activity/activity_widget_delegate.cc', 38 'activity/activity_widget_delegate.cc',
39 'activity/activity_widget_delegate.h', 39 'activity/activity_widget_delegate.h',
40 'activity/public/activity.h', 40 'activity/public/activity.h',
41 'activity/public/activity_factory.h', 41 'activity/public/activity_factory.h',
42 'activity/public/activity_manager.h', 42 'activity/public/activity_manager.h',
43 'activity/public/activity_manager_observer.h',
43 'activity/public/activity_view_manager.h', 44 'activity/public/activity_view_manager.h',
44 'activity/public/activity_view_model.h', 45 'activity/public/activity_view_model.h',
45 'athena_export.h', 46 'athena_export.h',
46 'common/container_priorities.h', 47 'common/container_priorities.h',
47 'common/fill_layout_manager.cc', 48 'common/fill_layout_manager.cc',
48 'common/fill_layout_manager.h', 49 'common/fill_layout_manager.h',
49 'common/switches.cc', 50 'common/switches.cc',
50 'common/switches.h', 51 'common/switches.h',
51 'home/app_list_view_delegate.cc', 52 'home/app_list_view_delegate.cc',
52 'home/app_list_view_delegate.h', 53 'home/app_list_view_delegate.h',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 'content/content_app_model_builder.cc', 127 'content/content_app_model_builder.cc',
127 'content/public/app_registry.h', 128 'content/public/app_registry.h',
128 'content/public/content_activity_factory.h', 129 'content/public/content_activity_factory.h',
129 'content/public/content_app_model_builder.h', 130 'content/public/content_app_model_builder.h',
130 'content/public/web_contents_view_delegate_creator.h', 131 'content/public/web_contents_view_delegate_creator.h',
131 'content/render_view_context_menu_impl.cc', 132 'content/render_view_context_menu_impl.cc',
132 'content/render_view_context_menu_impl.h', 133 'content/render_view_context_menu_impl.h',
133 'content/web_activity.cc', 134 'content/web_activity.cc',
134 'content/web_activity.h', 135 'content/web_activity.h',
135 'content/web_contents_view_delegate_factory_impl.cc', 136 'content/web_contents_view_delegate_factory_impl.cc',
137 'resource_manager/memory_pressure_notifier.cc',
138 'resource_manager/memory_pressure_notifier.h',
139 'resource_manager/resource_manager_impl.cc',
140 'resource_manager/public/resource_manager.h',
141 'resource_manager/public/resource_manager_delegate.h',
136 'virtual_keyboard/public/virtual_keyboard_manager.h', 142 'virtual_keyboard/public/virtual_keyboard_manager.h',
137 'virtual_keyboard/virtual_keyboard_manager_impl.cc', 143 'virtual_keyboard/virtual_keyboard_manager_impl.cc',
138 ], 144 ],
139 }, 145 },
140 { 146 {
141 'target_name': 'athena_content_support_lib', 147 'target_name': 'athena_content_support_lib',
142 'type': 'static_library', 148 'type': 'static_library',
143 'dependencies': [ 149 'dependencies': [
144 '../content/content.gyp:content_browser', 150 '../content/content.gyp:content_browser',
145 ], 151 ],
146 'sources': [ 152 'sources': [
147 'content/delegate/app_content_control_delegate_impl.cc', 153 'content/delegate/app_content_control_delegate_impl.cc',
148 'content/public/app_content_control_delegate.h', 154 'content/public/app_content_control_delegate.h',
155 'resource_manager/delegate/resource_manager_delegate.cc',
156 '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.
149 ], 157 ],
150 }, 158 },
151 { 159 {
152 'target_name': 'athena_test_support', 160 'target_name': 'athena_test_support',
153 'type': 'static_library', 161 'type': 'static_library',
154 'dependencies': [ 162 'dependencies': [
155 '../base/base.gyp:test_support_base', 163 '../base/base.gyp:test_support_base',
156 '../chromeos/chromeos.gyp:chromeos', 164 '../chromeos/chromeos.gyp:chromeos',
157 '../skia/skia.gyp:skia', 165 '../skia/skia.gyp:skia',
158 '../testing/gtest.gyp:gtest', 166 '../testing/gtest.gyp:gtest',
159 '../ui/accessibility/accessibility.gyp:ax_gen', 167 '../ui/accessibility/accessibility.gyp:ax_gen',
160 '../ui/app_list/app_list.gyp:app_list', 168 '../ui/app_list/app_list.gyp:app_list',
161 '../ui/aura/aura.gyp:aura_test_support', 169 '../ui/aura/aura.gyp:aura_test_support',
162 '../ui/base/ui_base.gyp:ui_base_test_support', 170 '../ui/base/ui_base.gyp:ui_base_test_support',
163 '../ui/compositor/compositor.gyp:compositor_test_support', 171 '../ui/compositor/compositor.gyp:compositor_test_support',
164 '../ui/views/views.gyp:views', 172 '../ui/views/views.gyp:views',
165 '../ui/wm/wm.gyp:wm', 173 '../ui/wm/wm.gyp:wm',
166 '../url/url.gyp:url_lib', 174 '../url/url.gyp:url_lib',
167 'athena_content_lib', 175 'athena_content_lib',
168 'athena_lib', 176 'athena_lib',
169 'resources/athena_resources.gyp:athena_resources', 177 'resources/athena_resources.gyp:athena_resources',
170 ], 178 ],
171 'sources': [ 179 'sources': [
172 'content/public/app_content_control_delegate.h', 180 'content/public/app_content_control_delegate.h',
181 '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.
173 'test/athena_test_base.cc', 182 'test/athena_test_base.cc',
174 'test/athena_test_base.h', 183 'test/athena_test_base.h',
175 'test/athena_test_helper.cc', 184 'test/athena_test_helper.cc',
176 'test/athena_test_helper.h', 185 'test/athena_test_helper.h',
177 'test/sample_activity.cc', 186 'test/sample_activity.cc',
178 'test/sample_activity.h', 187 'test/sample_activity.h',
179 'test/sample_activity_factory.cc', 188 'test/sample_activity_factory.cc',
180 'test/sample_activity_factory.h', 189 'test/sample_activity_factory.h',
181 'test/test_app_content_control_delegate_impl.cc', 190 'test/test_app_content_control_delegate_impl.cc',
182 'test/test_app_model_builder.cc', 191 'test/test_app_model_builder.cc',
183 'test/test_app_model_builder.h', 192 'test/test_app_model_builder.h',
193 'test/test_resource_manager_delegate.cc',
184 'test/test_screen_manager_delegate.cc', 194 'test/test_screen_manager_delegate.cc',
185 'test/test_screen_manager_delegate.h', 195 'test/test_screen_manager_delegate.h',
186 'wm/test/window_manager_impl_test_api.cc', 196 'wm/test/window_manager_impl_test_api.cc',
187 'wm/test/window_manager_impl_test_api.h', 197 'wm/test/window_manager_impl_test_api.h',
188 ], 198 ],
189 }, 199 },
190 { 200 {
191 'target_name': 'athena_unittests', 201 'target_name': 'athena_unittests',
192 'type': 'executable', 202 'type': 'executable',
193 'dependencies': [ 203 'dependencies': [
194 '../skia/skia.gyp:skia', 204 '../skia/skia.gyp:skia',
195 '../testing/gtest.gyp:gtest', 205 '../testing/gtest.gyp:gtest',
196 'athena_lib', 206 'athena_lib',
197 'athena_test_support', 207 'athena_test_support',
198 'main/athena_main.gyp:athena_main_lib', 208 'main/athena_main.gyp:athena_main_lib',
199 'resources/athena_resources.gyp:athena_pak', 209 'resources/athena_resources.gyp:athena_pak',
200 ], 210 ],
201 'sources': [ 211 'sources': [
202 'activity/activity_manager_unittest.cc', 212 'activity/activity_manager_unittest.cc',
203 'common/fill_layout_manager_unittest.cc', 213 'common/fill_layout_manager_unittest.cc',
204 'content/app_activity_unittest.cc', 214 'content/app_activity_unittest.cc',
205 'home/home_card_unittest.cc', 215 'home/home_card_unittest.cc',
206 'input/accelerator_manager_unittest.cc', 216 'input/accelerator_manager_unittest.cc',
217 'resource_manager/memory_pressure_notifier_unittest.cc',
218 'resource_manager/resource_manager_unittest.cc',
207 'screen/screen_manager_unittest.cc', 219 'screen/screen_manager_unittest.cc',
208 'test/athena_unittests.cc', 220 'test/athena_unittests.cc',
209 'wm/split_view_controller_unittest.cc', 221 'wm/split_view_controller_unittest.cc',
210 'wm/window_list_provider_impl_unittest.cc', 222 'wm/window_list_provider_impl_unittest.cc',
211 'wm/window_manager_unittest.cc', 223 'wm/window_manager_unittest.cc',
212 ], 224 ],
213 } 225 }
214 ], 226 ],
215 } 227 }
216 228
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698