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

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: Use associated interfaces for observers and item delegates. 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
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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 "//chrome") 601 "//chrome")
602 defines += [ "USE_LIBSECRET" ] 602 defines += [ "USE_LIBSECRET" ]
603 } 603 }
604 if (use_aura) { 604 if (use_aura) {
605 sources += 605 sources +=
606 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") 606 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome")
607 607
608 # These files are only built in a GN build because they bring in 608 # These files are only built in a GN build because they bring in
609 # dependencies that don't build with GYP. 609 # dependencies that don't build with GYP.
610 sources += [ 610 sources += [
611 "ui/ash/launcher/chrome_mash_shelf_controller.cc",
612 "ui/ash/launcher/chrome_mash_shelf_controller.h",
611 "ui/views/frame/browser_frame_mus.cc", 613 "ui/views/frame/browser_frame_mus.cc",
612 "ui/views/frame/browser_frame_mus.h", 614 "ui/views/frame/browser_frame_mus.h",
613 "ui/views/frame/browser_non_client_frame_view_mus.cc", 615 "ui/views/frame/browser_non_client_frame_view_mus.cc",
614 "ui/views/frame/browser_non_client_frame_view_mus.h", 616 "ui/views/frame/browser_non_client_frame_view_mus.h",
615 ] 617 ]
616 deps += [ 618 deps += [
617 "//components/mus/public/cpp", 619 "//components/mus/public/cpp",
620 "//components/prefs",
618 "//content/public/common", 621 "//content/public/common",
622 "//mash/shelf/public/interfaces",
619 "//mojo/shell/runner/common", 623 "//mojo/shell/runner/common",
624 "//skia/public",
620 "//ui/aura", 625 "//ui/aura",
621 "//ui/compositor", 626 "//ui/compositor",
622 "//ui/keyboard", 627 "//ui/keyboard",
623 "//ui/keyboard:keyboard_with_content", 628 "//ui/keyboard:keyboard_with_content",
624 "//ui/views/mus:for_component", 629 "//ui/views/mus:for_component",
625 ] 630 ]
626 defines += [ "MOJO_SHELL_CLIENT" ] 631 defines += [ "MOJO_SHELL_CLIENT" ]
627 data_deps += [ "//mash/wm" ] 632 data_deps += [ "//mash/wm" ]
628 } 633 }
629 if (ui_compositor_image_transport) { 634 if (ui_compositor_image_transport) {
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1333 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1329 deps = [ 1334 deps = [
1330 "//components/google/core/browser", 1335 "//components/google/core/browser",
1331 "//components/omnibox/browser", 1336 "//components/omnibox/browser",
1332 "//components/rlz", 1337 "//components/rlz",
1333 "//components/search_engines", 1338 "//components/search_engines",
1334 "//rlz:rlz_lib", 1339 "//rlz:rlz_lib",
1335 ] 1340 ]
1336 } 1341 }
1337 } 1342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698