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

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

Issue 1003323005: Fix ODR violation for ShowTaskManager() on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/chrome_browser_ui.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 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 if (enable_basic_printing || enable_print_preview) { 142 if (enable_basic_printing || enable_print_preview) {
143 deps += [ "//printing" ] 143 deps += [ "//printing" ]
144 } 144 }
145 145
146 if (enable_one_click_signin) { 146 if (enable_one_click_signin) {
147 sources += 147 sources +=
148 rebase_path(gypi_values.chrome_browser_ui_one_click_signin_sources, 148 rebase_path(gypi_values.chrome_browser_ui_one_click_signin_sources,
149 ".", 149 ".",
150 "//chrome") 150 "//chrome")
151 } 151 }
152 if (enable_task_manager) {
153 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources,
154 ".",
155 "//chrome")
156 }
157 if (enable_nacl) { 152 if (enable_nacl) {
158 sources += 153 sources +=
159 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome") 154 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome")
160 deps += [ "//native_client/src/trusted/service_runtime:sel" ] 155 deps += [ "//native_client/src/trusted/service_runtime:sel" ]
161 } 156 }
162 if (enable_configuration_policy) { 157 if (enable_configuration_policy) {
163 sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources, 158 sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources,
164 ".", 159 ".",
165 "//chrome") 160 "//chrome")
166 deps += [ "//components/policy" ] 161 deps += [ "//components/policy" ]
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 "//chrome/browser", 530 "//chrome/browser",
536 "//content/public/browser", 531 "//content/public/browser",
537 "//content/public/common", 532 "//content/public/common",
538 "//content/test:test_support", 533 "//content/test:test_support",
539 "//net:test_support", 534 "//net:test_support",
540 "//skia", 535 "//skia",
541 "//testing/gtest", 536 "//testing/gtest",
542 "//ui/base", 537 "//ui/base",
543 ] 538 ]
544 } 539 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698