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

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

Issue 1921403002: Pin apps from prefs on the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only use ChromeMashShelfController with use_ash=1. Created 4 years, 7 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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.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 import("//chrome/common/features.gni") 8 import("//chrome/common/features.gni")
9 9
10 gypi_values = exec_script("//build/gypi_to_gn.py", 10 gypi_values = exec_script("//build/gypi_to_gn.py",
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 } 248 }
249 if (use_cups) { 249 if (use_cups) {
250 configs += [ "//printing:cups" ] 250 configs += [ "//printing:cups" ]
251 } 251 }
252 if (use_ash) { 252 if (use_ash) {
253 sources += 253 sources +=
254 rebase_path(gypi_values.chrome_browser_ui_ash_sources, ".", "//chrome") 254 rebase_path(gypi_values.chrome_browser_ui_ash_sources, ".", "//chrome")
255 sources += [ 255 sources += [
256 "ash/keyboard_ui_service.cc", 256 "ash/keyboard_ui_service.cc",
257 "ash/keyboard_ui_service.h", 257 "ash/keyboard_ui_service.h",
258 "ash/launcher/chrome_mash_shelf_controller.cc",
259 "ash/launcher/chrome_mash_shelf_controller.h",
258 ] 260 ]
259 deps += [ 261 deps += [
260 "//ash", 262 "//ash",
261 "//ash:ash_with_content", 263 "//ash:ash_with_content",
262 "//ash/strings", 264 "//ash/strings",
263 "//components/user_manager", 265 "//components/user_manager",
266 "//mash/shelf/public/interfaces",
267 "//skia/public",
264 "//ui/app_list/presenter", 268 "//ui/app_list/presenter",
265 "//ui/keyboard:mojom", 269 "//ui/keyboard:mojom",
266 ] 270 ]
267 if (!is_chromeos) { 271 if (!is_chromeos) {
268 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, 272 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos,
269 ".", 273 ".",
270 "//chrome") 274 "//chrome")
271 } 275 }
272 } else { # Not ash. 276 } else { # Not ash.
273 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, 277 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources,
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 "//chrome/browser", 670 "//chrome/browser",
667 "//content/public/browser", 671 "//content/public/browser",
668 "//content/public/common", 672 "//content/public/common",
669 "//content/test:test_support", 673 "//content/test:test_support",
670 "//net:test_support", 674 "//net:test_support",
671 "//skia", 675 "//skia",
672 "//testing/gtest", 676 "//testing/gtest",
673 "//ui/base", 677 "//ui/base",
674 ] 678 ]
675 } 679 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698