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

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

Issue 1160773004: extensions: Check |enable_extensions| flag before depending on extension code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge 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 | « apps/apps.gypi ('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("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
10 [ rebase_path("../../chrome_browser_ui.gypi") ], 10 [ rebase_path("../../chrome_browser_ui.gypi") ],
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 sources += 206 sources +=
207 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, 207 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources,
208 ".", 208 ".",
209 "//chrome") 209 "//chrome")
210 } 210 }
211 if (!is_mac) { 211 if (!is_mac) {
212 sources += 212 sources +=
213 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, 213 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
214 ".", 214 ".",
215 "//chrome") 215 "//chrome")
216 if (enable_extensions) {
217 sources += rebase_path(
218 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources,
219 ".",
220 "//chrome")
221 deps += [ "//extensions/components/native_app_window" ]
222 }
216 if (is_chromeos) { 223 if (is_chromeos) {
217 # TODO(GYP): crbug.com/481629. These files should probably not be 224 # TODO(GYP): crbug.com/481629. These files should probably not be
218 # a part of ui_views_non_mac_sources at all. 225 # a part of ui_views_non_mac_sources at all.
219 sources -= [ 226 sources -= [
220 "views/frame/opaque_browser_frame_view.cc", 227 "views/frame/opaque_browser_frame_view.cc",
221 "views/frame/opaque_browser_frame_view.h", 228 "views/frame/opaque_browser_frame_view.h",
222 "views/frame/opaque_browser_frame_view_linux.cc", 229 "views/frame/opaque_browser_frame_view_linux.cc",
223 "views/frame/opaque_browser_frame_view_linux.h", 230 "views/frame/opaque_browser_frame_view_linux.h",
224 ] 231 ]
225 } 232 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 ] 313 ]
307 if (mac_views_browser) { 314 if (mac_views_browser) {
308 sources += rebase_path( 315 sources += rebase_path(
309 gypi_values.chrome_browser_ui_views_mac_experimental_sources, 316 gypi_values.chrome_browser_ui_views_mac_experimental_sources,
310 ".", 317 ".",
311 "//chrome") 318 "//chrome")
312 sources += 319 sources +=
313 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, 320 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
314 ".", 321 ".",
315 "//chrome") 322 "//chrome")
323 sources += rebase_path(
324 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources,
325 ".",
326 "//chrome")
327 deps += [ "//extensions/components/native_app_window" ]
316 } else { 328 } else {
317 sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources, 329 sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources,
318 ".", 330 ".",
319 "//chrome") 331 "//chrome")
320 } 332 }
321 include_dirs = [ "$target_gen_dir" ] 333 include_dirs = [ "$target_gen_dir" ]
322 libs += [ "Quartz.framework" ] 334 libs += [ "Quartz.framework" ]
323 configs += 335 configs +=
324 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ] 336 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ]
325 } else { # non-Mac. 337 } else { # non-Mac.
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 "//chrome/browser", 526 "//chrome/browser",
515 "//content/public/browser", 527 "//content/public/browser",
516 "//content/public/common", 528 "//content/public/common",
517 "//content/test:test_support", 529 "//content/test:test_support",
518 "//net:test_support", 530 "//net:test_support",
519 "//skia", 531 "//skia",
520 "//testing/gtest", 532 "//testing/gtest",
521 "//ui/base", 533 "//ui/base",
522 ] 534 ]
523 } 535 }
OLDNEW
« no previous file with comments | « apps/apps.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698