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

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

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 8 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 | « ash/mus/sysui_application.cc ('k') | chrome/browser/ui/ash/DEPS » ('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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 "//chrome") 602 "//chrome")
603 defines += [ "USE_LIBSECRET" ] 603 defines += [ "USE_LIBSECRET" ]
604 } 604 }
605 if (use_aura) { 605 if (use_aura) {
606 sources += 606 sources +=
607 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") 607 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome")
608 608
609 # These files are only built in a GN build because they bring in 609 # These files are only built in a GN build because they bring in
610 # dependencies that don't build with GYP. 610 # dependencies that don't build with GYP.
611 sources += [ 611 sources += [
612 "ui/ash/launcher/chrome_mash_shelf_controller.cc",
613 "ui/ash/launcher/chrome_mash_shelf_controller.h",
612 "ui/views/frame/browser_frame_mus.cc", 614 "ui/views/frame/browser_frame_mus.cc",
613 "ui/views/frame/browser_frame_mus.h", 615 "ui/views/frame/browser_frame_mus.h",
614 "ui/views/frame/browser_non_client_frame_view_mus.cc", 616 "ui/views/frame/browser_non_client_frame_view_mus.cc",
615 "ui/views/frame/browser_non_client_frame_view_mus.h", 617 "ui/views/frame/browser_non_client_frame_view_mus.h",
616 ] 618 ]
617 deps += [ 619 deps += [
618 "//components/mus/public/cpp", 620 "//components/mus/public/cpp",
621 "//components/prefs",
619 "//content/public/common", 622 "//content/public/common",
623 "//mash/shelf/public/interfaces",
620 "//mojo/shell/runner/common", 624 "//mojo/shell/runner/common",
625 "//skia/public",
621 "//ui/aura", 626 "//ui/aura",
622 "//ui/compositor", 627 "//ui/compositor",
623 "//ui/keyboard", 628 "//ui/keyboard",
624 "//ui/keyboard:keyboard_with_content", 629 "//ui/keyboard:keyboard_with_content",
625 "//ui/views/mus:for_component", 630 "//ui/views/mus:for_component",
626 ] 631 ]
627 defines += [ "MOJO_SHELL_CLIENT" ] 632 defines += [ "MOJO_SHELL_CLIENT" ]
628 data_deps += [ "//mash/wm" ] 633 data_deps += [ "//mash/wm" ]
629 } 634 }
630 if (ui_compositor_image_transport) { 635 if (ui_compositor_image_transport) {
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1334 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1330 deps = [ 1335 deps = [
1331 "//components/google/core/browser", 1336 "//components/google/core/browser",
1332 "//components/omnibox/browser", 1337 "//components/omnibox/browser",
1333 "//components/rlz", 1338 "//components/rlz",
1334 "//components/search_engines", 1339 "//components/search_engines",
1335 "//rlz:rlz_lib", 1340 "//rlz:rlz_lib",
1336 ] 1341 ]
1337 } 1342 }
1338 } 1343 }
OLDNEW
« no previous file with comments | « ash/mus/sysui_application.cc ('k') | chrome/browser/ui/ash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698