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

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

Issue 910343003: Create an in-process v8 proxy resolver using Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-complete-patch
Patch Set: Remove extra space. Created 5 years, 9 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 | « no previous file | chrome/browser/net/proxy_service_factory.cc » ('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 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
10 # produces a conflict for the "grit" template so we have to only include one. 10 # produces a conflict for the "grit" template so we have to only include one.
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 if (is_win || is_mac || is_desktop_linux) { 378 if (is_win || is_mac || is_desktop_linux) {
379 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources, 379 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
380 ".", 380 ".",
381 "//chrome") 381 "//chrome")
382 } 382 }
383 if (is_android || is_ios) { 383 if (is_android || is_ios) {
384 sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources, 384 sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
385 ".", 385 ".",
386 "//chrome") 386 "//chrome")
387 } else { 387 } else {
388 deps += [ "//chrome/browser/policy:path_parser" ] 388 deps += [
389 "//chrome/browser/policy:path_parser",
390 "//net:net_browser_services",
391 ]
389 } 392 }
390 } else { 393 } else {
391 # Configuration policy disabled. 394 # Configuration policy disabled.
392 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources, 395 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources,
393 ".", 396 ".",
394 "//chrome") 397 "//chrome")
395 } 398 }
396 399
397 if (enable_plugins) { 400 if (enable_plugins) {
398 sources += 401 sources +=
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 ] 1101 ]
1099 } 1102 }
1100 1103
1101 if (enable_wifi_bootstrapping) { 1104 if (enable_wifi_bootstrapping) {
1102 sources += [ 1105 sources += [
1103 "local_discovery/wifi/mock_wifi_manager.cc", 1106 "local_discovery/wifi/mock_wifi_manager.cc",
1104 "local_discovery/wifi/mock_wifi_manager.h", 1107 "local_discovery/wifi/mock_wifi_manager.h",
1105 ] 1108 ]
1106 } 1109 }
1107 } 1110 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/proxy_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698