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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 1182053007: Revert of Revert of views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « chrome/browser/extensions/BUILD.gn ('k') | chrome/chrome_browser_extensions.gypi » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 # All .cc, .h, .m, and .mm files under browser except for: 7 # All .cc, .h, .m, and .mm files under browser except for:
8 # * tests and mocks. 8 # * tests and mocks.
9 # * code below browser/chromeos 9 # * code below browser/chromeos
10 # * code below browser/extensions 10 # * code below browser/extensions
(...skipping 3273 matching lines...) Expand 10 before | Expand all | Expand 10 after
3284 # These files are generated by GRIT. 3284 # These files are generated by GRIT.
3285 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', 3285 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
3286 '<(grit_out_dir)/grit/component_extension_resources_map.cc', 3286 '<(grit_out_dir)/grit/component_extension_resources_map.cc',
3287 '<(grit_out_dir)/grit/settings_resources_map.cc', 3287 '<(grit_out_dir)/grit/settings_resources_map.cc',
3288 '<(grit_out_dir)/grit/theme_resources_map.cc', 3288 '<(grit_out_dir)/grit/theme_resources_map.cc',
3289 3289
3290 # This file is generated by 3290 # This file is generated by
3291 # chrome/browser/metrics/variations/generate_resources_map.py 3291 # chrome/browser/metrics/variations/generate_resources_map.py
3292 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc', 3292 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc',
3293 ], 3293 ],
3294 'conditions': [
3295 ['toolkit_views==1', {
3296 'dependencies': [ '../ui/views/views.gyp:views' ],
3297 }],
3298 ],
3294 }, { # OS == "ios" 3299 }, { # OS == "ios"
3295 'dependencies': [ 3300 'dependencies': [
3296 '../net/net.gyp:net', 3301 '../net/net.gyp:net',
3297 ], 3302 ],
3298 # A few sources had been brought up for iOS before the decision not to 3303 # A few sources had been brought up for iOS before the decision not to
3299 # use chrome/ for iOS long-term. Keep building them to prevent iOS 3304 # use chrome/ for iOS long-term. Keep building them to prevent iOS
3300 # regressions until they have been componentized. 3305 # regressions until they have been componentized.
3301 'sources': [ 3306 'sources': [
3302 '<@(chrome_browser_ios_sources)', 3307 '<@(chrome_browser_ios_sources)',
3303 '<@(chrome_browser_google_sources)', 3308 '<@(chrome_browser_google_sources)',
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
4022 'variables': { 4027 'variables': {
4023 'proto_in_dir': 'browser/sync_file_system/drive_backend', 4028 'proto_in_dir': 'browser/sync_file_system/drive_backend',
4024 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend', 4029 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
4025 }, 4030 },
4026 'includes': [ '../build/protoc.gypi' ] 4031 'includes': [ '../build/protoc.gypi' ]
4027 }, 4032 },
4028 ], 4033 ],
4029 },], 4034 },],
4030 ], 4035 ],
4031 } 4036 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/BUILD.gn ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698