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

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

Issue 716463002: Revert "MacViews: Get chrome/browser/ui/views/frame to compile" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/ui/cocoa/browser_window_factory.mm » ('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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 217 }
218 if (toolkit_views) { 218 if (toolkit_views) {
219 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, 219 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources,
220 ".", "//chrome") 220 ".", "//chrome")
221 deps += [ "//components/constrained_window" ] 221 deps += [ "//components/constrained_window" ]
222 if (!is_chromeos) { 222 if (!is_chromeos) {
223 sources += rebase_path( 223 sources += rebase_path(
224 gypi_values.chrome_browser_ui_views_non_chromeos_sources, 224 gypi_values.chrome_browser_ui_views_non_chromeos_sources,
225 ".", "//chrome") 225 ".", "//chrome")
226 } 226 }
227 if (is_mac) { 227 if (!is_mac) {
228 if (mac_views_browser) {
229 sources -= [ "cocoa/browser_window_factory_cocoa.mm" ]
230 } else {
231 sources -= [ "views/frame/browser_window_factory.cc" ]
232 }
233 } else {
234 sources += rebase_path( 228 sources += rebase_path(
235 gypi_values.chrome_browser_ui_views_non_mac_sources, 229 gypi_values.chrome_browser_ui_views_non_mac_sources,
236 ".", "//chrome") 230 ".", "//chrome")
237 deps += [ 231 deps += [
238 "//extensions/components/native_app_window", 232 "//extensions/components/native_app_window",
239 ] 233 ]
240 } 234 }
241 if (use_ash) { 235 if (use_ash) {
242 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, 236 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources,
243 ".", "//chrome") 237 ".", "//chrome")
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 "//chrome/browser", 487 "//chrome/browser",
494 "//content/public/browser", 488 "//content/public/browser",
495 "//content/public/common", 489 "//content/public/common",
496 "//content/test:test_support", 490 "//content/test:test_support",
497 "//net:test_support", 491 "//net:test_support",
498 "//skia", 492 "//skia",
499 "//testing/gtest", 493 "//testing/gtest",
500 "//ui/base", 494 "//ui/base",
501 ] 495 ]
502 } 496 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/ui/cocoa/browser_window_factory.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698