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

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

Issue 643103003: Use app_list_service_disabled in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 "//components/user_manager", 186 "//components/user_manager",
187 ] 187 ]
188 if (!is_chromeos) { 188 if (!is_chromeos) {
189 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, 189 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos,
190 ".", "//chrome") 190 ".", "//chrome")
191 } 191 }
192 } else { # Not ash. 192 } else { # Not ash.
193 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, 193 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources,
194 ".", "//chrome") 194 ".", "//chrome")
195 } 195 }
196 if (use_athena) {
197 sources += rebase_path(gypi_values.chrome_browser_ui_athena_sources,
198 ".", "//chrome")
199 } else { # Not athena.
200 if (use_ash) {
201 sources += rebase_path(
202 gypi_values.chrome_browser_ui_ash_non_athena_sources,
203 ".", "//chrome")
204 }
205 }
196 if (toolkit_views) { 206 if (toolkit_views) {
197 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, 207 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources,
198 ".", "//chrome") 208 ".", "//chrome")
199 if (!is_chromeos) { 209 if (!is_chromeos) {
200 sources += rebase_path( 210 sources += rebase_path(
201 gypi_values.chrome_browser_ui_views_non_chromeos_sources, 211 gypi_values.chrome_browser_ui_views_non_chromeos_sources,
202 ".", "//chrome") 212 ".", "//chrome")
203 } 213 }
204 if (!is_mac) { 214 if (!is_mac) {
205 sources += rebase_path( 215 sources += rebase_path(
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 "//chrome/browser", 463 "//chrome/browser",
454 "//content/public/browser", 464 "//content/public/browser",
455 "//content/public/common", 465 "//content/public/common",
456 "//content/test:test_support", 466 "//content/test:test_support",
457 "//net:test_support", 467 "//net:test_support",
458 "//skia", 468 "//skia",
459 "//testing/gtest", 469 "//testing/gtest",
460 "//ui/base", 470 "//ui/base",
461 ] 471 ]
462 } 472 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/webstore_private/webstore_private_api.cc ('k') | chrome/browser/ui/ash/ash_init.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698