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

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

Issue 1460593004: Revert of p1 mus+ash chrome renders ui and content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « base/threading/thread_restrictions.h ('k') | components/bitmap_uploader/bitmap_uploader.h » ('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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 "//components/proximity_auth/webui", 147 "//components/proximity_auth/webui",
148 "//device/bluetooth", 148 "//device/bluetooth",
149 "//third_party/libusb", 149 "//third_party/libusb",
150 ] 150 ]
151 151
152 if (is_android) { 152 if (is_android) {
153 deps -= [ "//third_party/libusb" ] 153 deps -= [ "//third_party/libusb" ]
154 } 154 }
155 } 155 }
156 156
157 if (use_aura) {
158 defines += [ "MOJO_RUNNER_CLIENT" ]
159 }
160
161 if (enable_basic_printing || enable_print_preview) { 157 if (enable_basic_printing || enable_print_preview) {
162 deps += [ "//printing" ] 158 deps += [ "//printing" ]
163 } 159 }
164 160
165 if (enable_nacl) { 161 if (enable_nacl) {
166 sources += 162 sources +=
167 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome") 163 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome")
168 deps += [ "//native_client/src/trusted/service_runtime:sel" ] 164 deps += [ "//native_client/src/trusted/service_runtime:sel" ]
169 } 165 }
170 if (enable_configuration_policy) { 166 if (enable_configuration_policy) {
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 "//chrome/browser", 598 "//chrome/browser",
603 "//content/public/browser", 599 "//content/public/browser",
604 "//content/public/common", 600 "//content/public/common",
605 "//content/test:test_support", 601 "//content/test:test_support",
606 "//net:test_support", 602 "//net:test_support",
607 "//skia", 603 "//skia",
608 "//testing/gtest", 604 "//testing/gtest",
609 "//ui/base", 605 "//ui/base",
610 ] 606 ]
611 } 607 }
OLDNEW
« no previous file with comments | « base/threading/thread_restrictions.h ('k') | components/bitmap_uploader/bitmap_uploader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698