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

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

Issue 719383002: Cleanup: supervised_user_theme.cc should not be built if themes are not enabled. (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 | « no previous file | chrome/chrome_browser.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 import("//components/nacl/nacl_defines.gni") 8 import("//components/nacl/nacl_defines.gni")
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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 if (enable_app_list) { 616 if (enable_app_list) {
617 deps += [ 617 deps += [
618 "//ui/app_list", 618 "//ui/app_list",
619 ] 619 ]
620 } 620 }
621 if (enable_managed_users) { 621 if (enable_managed_users) {
622 sources += rebase_path( 622 sources += rebase_path(
623 gypi_values.chrome_browser_supervised_user_sources, 623 gypi_values.chrome_browser_supervised_user_sources,
624 ".", "//chrome") 624 ".", "//chrome")
625 } 625 }
626 if (enable_managed_users && enable_themes) {
627 sources += rebase_path(
628 gypi_values.chrome_browser_supervised_user_and_themes_sources,
629 ".", "//chrome")
630 }
626 if (enable_webrtc) { 631 if (enable_webrtc) {
627 sources += rebase_path( 632 sources += rebase_path(
628 gypi_values.chrome_browser_webrtc_sources, 633 gypi_values.chrome_browser_webrtc_sources,
629 ".", "//chrome") 634 ".", "//chrome")
630 } 635 }
631 if (enable_service_discovery) { 636 if (enable_service_discovery) {
632 sources += rebase_path( 637 sources += rebase_path(
633 gypi_values.chrome_browser_service_discovery_sources, 638 gypi_values.chrome_browser_service_discovery_sources,
634 ".", "//chrome") 639 ".", "//chrome")
635 } 640 }
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 ] 964 ]
960 } 965 }
961 966
962 if (enable_wifi_bootstrapping) { 967 if (enable_wifi_bootstrapping) {
963 sources += [ 968 sources += [
964 "local_discovery/wifi/mock_wifi_manager.cc", 969 "local_discovery/wifi/mock_wifi_manager.cc",
965 "local_discovery/wifi/mock_wifi_manager.h", 970 "local_discovery/wifi/mock_wifi_manager.h",
966 ] 971 ]
967 } 972 }
968 } 973 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698