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

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

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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
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( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 } 127 }
128 128
129 if (enable_one_click_signin) { 129 if (enable_one_click_signin) {
130 sources += rebase_path( 130 sources += rebase_path(
131 gypi_values.chrome_browser_ui_one_click_signin_sources, 131 gypi_values.chrome_browser_ui_one_click_signin_sources,
132 ".", "//chrome") 132 ".", "//chrome")
133 } 133 }
134 if (enable_task_manager) { 134 if (enable_task_manager) {
135 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, 135 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources,
136 ".", "//chrome") 136 ".", "//chrome")
137 if (!toolkit_views || is_mac) { 137 if (!toolkit_views) {
138 sources -= [ "views/task_manager_view.cc" ] 138 sources -= [ "views/task_manager_view.cc" ]
139 } 139 }
140 } 140 }
141 if (!enable_nacl) { 141 if (!enable_nacl) {
142 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources, 142 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources,
143 ".", "//chrome") 143 ".", "//chrome")
144 deps += [ 144 deps += [
145 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T ODO(GYP) 145 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T ODO(GYP)
146 ] 146 ]
147 } 147 }
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 "//chrome/browser", 468 "//chrome/browser",
469 "//content/public/browser", 469 "//content/public/browser",
470 "//content/public/common", 470 "//content/public/common",
471 "//content/test:test_support", 471 "//content/test:test_support",
472 "//net:test_support", 472 "//net:test_support",
473 "//skia", 473 "//skia",
474 "//testing/gtest", 474 "//testing/gtest",
475 "//ui/base", 475 "//ui/base",
476 ] 476 ]
477 } 477 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698