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

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

Issue 1427393002: Revert of Allow Chrome to bind an Application request from mojo_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@callback
Patch Set: Created 5 years, 1 month 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 | « no previous file | chrome/browser/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("//media/media_options.gni") 9 import("//media/media_options.gni")
10 import("//third_party/protobuf/proto_library.gni") 10 import("//third_party/protobuf/proto_library.gni")
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 } 559 }
560 if (is_desktop_linux) { 560 if (is_desktop_linux) {
561 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, 561 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources,
562 ".", 562 ".",
563 "//chrome") 563 "//chrome")
564 defines += [ "USE_LIBSECRET" ] 564 defines += [ "USE_LIBSECRET" ]
565 } 565 }
566 if (use_aura) { 566 if (use_aura) {
567 sources += 567 sources +=
568 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") 568 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome")
569
570 # These files are only built in a GN build because they bring in
571 # dependencies that don't build with GYP.
572 sources += [
573 "mojo_runner_state.cc",
574 "mojo_runner_state.h",
575 ]
576 deps += [ 569 deps += [
577 "//mojo/runner/child:lib",
578 "//ui/aura", 570 "//ui/aura",
579 "//ui/compositor", 571 "//ui/compositor",
580 "//ui/keyboard", 572 "//ui/keyboard",
581 "//ui/keyboard:keyboard_with_content", 573 "//ui/keyboard:keyboard_with_content",
582 ] 574 ]
583 defines += [ "MOJO_RUNNER_CLIENT" ]
584 } 575 }
585 if (ui_compositor_image_transport) { 576 if (ui_compositor_image_transport) {
586 deps += [ "//ui/gl" ] 577 deps += [ "//ui/gl" ]
587 } 578 }
588 579
589 if (use_ash) { 580 if (use_ash) {
590 sources += 581 sources +=
591 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome") 582 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome")
592 } 583 }
593 584
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
1253 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1244 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1254 deps = [ 1245 deps = [
1255 "//components/google/core/browser", 1246 "//components/google/core/browser",
1256 "//components/omnibox/browser", 1247 "//components/omnibox/browser",
1257 "//components/rlz", 1248 "//components/rlz",
1258 "//components/search_engines", 1249 "//components/search_engines",
1259 "//rlz:rlz_lib", 1250 "//rlz:rlz_lib",
1260 ] 1251 ]
1261 } 1252 }
1262 } 1253 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698