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

Side by Side Diff: content/content_shell.gypi

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('k') | content/shell/DEPS » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 '../ui/views/views.gyp:views_test_support', 178 '../ui/views/views.gyp:views_test_support',
179 '../ui/ui.gyp:ui_resources', 179 '../ui/ui.gyp:ui_resources',
180 ], 180 ],
181 'sources/': [ 181 'sources/': [
182 ['exclude', 'shell/shell_gtk.cc'], 182 ['exclude', 'shell/shell_gtk.cc'],
183 ['exclude', 'shell/shell_win.cc'], 183 ['exclude', 'shell/shell_win.cc'],
184 ], 184 ],
185 }], # use_aura==1 185 }], # use_aura==1
186 ['chromeos==1', { 186 ['chromeos==1', {
187 'dependencies': [ 187 'dependencies': [
188 '../ash/ash.gyp:ash',
188 '../chromeos/chromeos.gyp:chromeos', 189 '../chromeos/chromeos.gyp:chromeos',
189 ], 190 ],
190 }], # chromeos==1 191 }], # chromeos==1
191 ], 192 ],
192 }, 193 },
193 { 194 {
194 'target_name': 'content_shell_resources', 195 'target_name': 'content_shell_resources',
195 'type': 'none', 196 'type': 'none',
196 'dependencies': [ 197 'dependencies': [
197 'generate_content_shell_resources', 198 'generate_content_shell_resources',
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 'resource_dir': '../res', 639 'resource_dir': '../res',
639 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'], 640 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'],
640 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 641 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
641 }, 642 },
642 'includes': [ '../build/java_apk.gypi' ], 643 'includes': [ '../build/java_apk.gypi' ],
643 }, 644 },
644 ], 645 ],
645 }], # OS=="android" 646 }], # OS=="android"
646 ] 647 ]
647 } 648 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('k') | content/shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698