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

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

Issue 1192583002: 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 | « build/config/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//third_party/protobuf/proto_library.gni") 9 import("//third_party/protobuf/proto_library.gni")
10 10
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 "//third_party/re2", 294 "//third_party/re2",
295 "//third_party/smhasher:cityhash", 295 "//third_party/smhasher:cityhash",
296 "//third_party/webrtc/modules/desktop_capture", 296 "//third_party/webrtc/modules/desktop_capture",
297 "//ui/base/ime", 297 "//ui/base/ime",
298 "//ui/gl", 298 "//ui/gl",
299 "//ui/resources", 299 "//ui/resources",
300 "//ui/surface", 300 "//ui/surface",
301 "//ui/web_dialogs", 301 "//ui/web_dialogs",
302 "//v8", 302 "//v8",
303 ] 303 ]
304
305 if (toolkit_views) {
306 deps += [ "//ui/views" ]
307 }
308 } else { # iOS 304 } else { # iOS
309 sources += 305 sources +=
310 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") 306 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome")
311 sources += 307 sources +=
312 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") 308 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome")
313 deps += [ "//net" ] 309 deps += [ "//net" ]
314 libs += [ 310 libs += [
315 "CoreTelephony.framework", 311 "CoreTelephony.framework",
316 "CoreText.framework", 312 "CoreText.framework",
317 "MobileCoreServices.framework", 313 "MobileCoreServices.framework",
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 ] 1176 ]
1181 } 1177 }
1182 1178
1183 if (enable_wifi_bootstrapping) { 1179 if (enable_wifi_bootstrapping) {
1184 sources += [ 1180 sources += [
1185 "local_discovery/wifi/mock_wifi_manager.cc", 1181 "local_discovery/wifi/mock_wifi_manager.cc",
1186 "local_discovery/wifi/mock_wifi_manager.h", 1182 "local_discovery/wifi/mock_wifi_manager.h",
1187 ] 1183 ]
1188 } 1184 }
1189 } 1185 }
OLDNEW
« no previous file with comments | « build/config/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698