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

Side by Side Diff: apps/apps.gypi

Issue 25034003: Moved apps metro code from apps to chrome/browser/apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix unit test Created 7 years, 2 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
« no previous file with comments | « apps/app_shim/DEPS ('k') | apps/apps_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'apps', 8 'target_name': 'apps',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
11 # Since browser and browser_extensions actually depend on each other, 11 # Since browser and browser_extensions actually depend on each other,
12 # we must omit the dependency from browser_extensions to browser. 12 # we must omit the dependency from browser_extensions to browser.
13 # However, this means browser_extensions and browser should more or less 13 # However, this means browser_extensions and browser should more or less
14 # have the same dependencies. Once browser_extensions is untangled from 14 # have the same dependencies. Once browser_extensions is untangled from
15 # browser, then we can clean up these dependencies. 15 # browser, then we can clean up these dependencies.
16 'dependencies': [ 16 'dependencies': [
17 'browser_extensions', 17 'browser_extensions',
18 'common/extensions/api/api.gyp:api', 18 'common/extensions/api/api.gyp:api',
19 '../skia/skia.gyp:skia', 19 '../skia/skia.gyp:skia',
20 ], 20 ],
21 'include_dirs': [ 21 'include_dirs': [
22 '<(INTERMEDIATE_DIR)', 22 '<(INTERMEDIATE_DIR)',
23 '<(grit_out_dir)', 23 '<(grit_out_dir)',
24 ], 24 ],
25 'sources': [ 25 'sources': [
26 'app_launch_for_metro_restart_win.cc',
27 'app_launch_for_metro_restart_win.h',
28 'app_lifetime_monitor.cc', 26 'app_lifetime_monitor.cc',
29 'app_lifetime_monitor.h', 27 'app_lifetime_monitor.h',
30 'app_lifetime_monitor_factory.cc', 28 'app_lifetime_monitor_factory.cc',
31 'app_lifetime_monitor_factory.h', 29 'app_lifetime_monitor_factory.h',
32 'app_load_service.cc', 30 'app_load_service.cc',
33 'app_load_service.h', 31 'app_load_service.h',
34 'app_load_service_factory.cc', 32 'app_load_service_factory.cc',
35 'app_load_service_factory.h', 33 'app_load_service_factory.h',
36 'app_restore_service.cc', 34 'app_restore_service.cc',
37 'app_restore_service.h', 35 'app_restore_service.h',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 ['exclude', '^apps/'], 85 ['exclude', '^apps/'],
88 ], 86 ],
89 } 87 }
90 ], 88 ],
91 ], 89 ],
92 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 90 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
93 'msvs_disabled_warnings': [ 4267, ], 91 'msvs_disabled_warnings': [ 4267, ],
94 }, 92 },
95 ], 93 ],
96 } 94 }
OLDNEW
« no previous file with comments | « apps/app_shim/DEPS ('k') | apps/apps_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698