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

Side by Side Diff: chrome/browser/ui/BUILD.gn

Issue 375843002: MacViews: Initial chrome_browser_ui.gypi support for views on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove taskmanager changes: framework 78480k, resources 45232k Created 6 years, 4 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 | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser_ui.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 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 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 8
9 gypi_values = exec_script( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 } 131 }
132 132
133 if (enable_one_click_signin) { 133 if (enable_one_click_signin) {
134 sources += rebase_path( 134 sources += rebase_path(
135 gypi_values.chrome_browser_ui_one_click_signin_sources, 135 gypi_values.chrome_browser_ui_one_click_signin_sources,
136 ".", "//chrome") 136 ".", "//chrome")
137 } 137 }
138 if (enable_task_manager) { 138 if (enable_task_manager) {
139 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, 139 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources,
140 ".", "//chrome") 140 ".", "//chrome")
141 if (!toolkit_views) { 141 if (!toolkit_views || is_mac) {
142 sources -= [ "views/task_manager_view.cc" ] 142 sources -= [ "views/task_manager_view.cc" ]
143 } 143 }
144 } 144 }
145 if (!enable_nacl) { 145 if (!enable_nacl) {
146 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources, 146 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources,
147 ".", "//chrome") 147 ".", "//chrome")
148 deps += [ 148 deps += [
149 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T ODO(GYP) 149 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T ODO(GYP)
150 ] 150 ]
151 } 151 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 ".", "//chrome") 198 ".", "//chrome")
199 } 199 }
200 if (toolkit_views) { 200 if (toolkit_views) {
201 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, 201 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources,
202 ".", "//chrome") 202 ".", "//chrome")
203 if (!is_chromeos) { 203 if (!is_chromeos) {
204 sources += rebase_path( 204 sources += rebase_path(
205 gypi_values.chrome_browser_ui_views_non_chromeos_sources, 205 gypi_values.chrome_browser_ui_views_non_chromeos_sources,
206 ".", "//chrome") 206 ".", "//chrome")
207 } 207 }
208 if (!is_mac) {
209 sources += rebase_path(
210 gypi_values.chrome_browser_ui_views_non_mac_sources,
211 ".", "//chrome")
212 }
208 if (use_ash) { 213 if (use_ash) {
209 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, 214 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources,
210 ".", "//chrome") 215 ".", "//chrome")
211 } 216 }
212 } 217 }
213 if (use_aura && !use_ozone && is_desktop_linux) { 218 if (use_aura && !use_ozone && is_desktop_linux) {
214 deps += [ 219 deps += [
215 # gtk2 is the only component that can interact with gtk2 in our new 220 # gtk2 is the only component that can interact with gtk2 in our new
216 # world. 221 # world.
217 #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', TODO(GYP) 222 #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', TODO(GYP)
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 "//ui/views/controls/webview", 346 "//ui/views/controls/webview",
342 #'installer_util_strings', TODO(GYP) 347 #'installer_util_strings', TODO(GYP)
343 #'metro_utils', TODO(GYP) 348 #'metro_utils', TODO(GYP)
344 #'../google_update/google_update.gyp:google_update', TODO(GYP) 349 #'../google_update/google_update.gyp:google_update', TODO(GYP)
345 ] 350 ]
346 forward_dependent_configs_from += [ 351 forward_dependent_configs_from += [
347 "//ui/views", 352 "//ui/views",
348 "//ui/views/controls/webview", 353 "//ui/views/controls/webview",
349 ] 354 ]
350 } else { # 'OS!="win" 355 } else { # 'OS!="win"
351 if (use_aura) { 356 if (toolkit_views) {
352 deps += [ 357 deps += [
353 "//ui/views", 358 "//ui/views",
354 "//ui/views/controls/webview", 359 "//ui/views/controls/webview",
355 ] 360 ]
356 forward_dependent_configs_from += [ 361 forward_dependent_configs_from += [
357 "//ui/views", 362 "//ui/views",
358 "//ui/views/controls/webview", 363 "//ui/views/controls/webview",
359 ] 364 ]
360 } 365 }
361 } 366 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 } 416 }
412 if (enable_service_discovery) { 417 if (enable_service_discovery) {
413 sources += rebase_path( 418 sources += rebase_path(
414 gypi_values.chrome_browser_ui_service_discovery_sources, 419 gypi_values.chrome_browser_ui_service_discovery_sources,
415 ".", "//chrome") 420 ".", "//chrome")
416 } 421 }
417 if (enable_spellcheck) { 422 if (enable_spellcheck) {
418 deps += [ "//third_party/hunspell" ] 423 deps += [ "//third_party/hunspell" ]
419 } 424 }
420 } 425 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698