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

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

Issue 2119273002: Merge ChromeServiceTabLauncher and ServiceTabLauncher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into chrome_service_tab_launcher Created 4 years, 5 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/android/java_sources.gni ('k') | chrome/browser/android/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("//build/split_static_library.gni") 9 import("//build/split_static_library.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 ".", 767 ".",
768 "//chrome") 768 "//chrome")
769 deps += [ 769 deps += [
770 ":client_discourse_context_proto", 770 ":client_discourse_context_proto",
771 ":delta_file_proto", 771 ":delta_file_proto",
772 ":jni_headers", 772 ":jni_headers",
773 "//components/data_usage/android", 773 "//components/data_usage/android",
774 "//components/precache/content", 774 "//components/precache/content",
775 "//components/precache/core", 775 "//components/precache/core",
776 "//components/resources:components_resources", 776 "//components/resources:components_resources",
777 "//components/service_tab_launcher",
778 "//components/toolbar", 777 "//components/toolbar",
779 "//components/web_contents_delegate_android", 778 "//components/web_contents_delegate_android",
780 ] 779 ]
781 } 780 }
782 781
783 if (is_android) { 782 if (is_android) {
784 deps += [ 783 deps += [
785 "//components/cdm/browser", 784 "//components/cdm/browser",
786 "//components/resources:components_resources", 785 "//components/resources:components_resources",
787 "//third_party/android_opengl/etc1", 786 "//third_party/android_opengl/etc1",
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 # linking all of the test support. 1361 # linking all of the test support.
1363 source_set("pepper_cdm_test_constants") { 1362 source_set("pepper_cdm_test_constants") {
1364 testonly = true 1363 testonly = true
1365 visibility = [ "//chrome/*" ] 1364 visibility = [ "//chrome/*" ]
1366 sources = [ 1365 sources = [
1367 "media/pepper_cdm_test_constants.cc", 1366 "media/pepper_cdm_test_constants.cc",
1368 "media/pepper_cdm_test_constants.h", 1367 "media/pepper_cdm_test_constants.h",
1369 ] 1368 ]
1370 } 1369 }
1371 } 1370 }
OLDNEW
« no previous file with comments | « chrome/android/java_sources.gni ('k') | chrome/browser/android/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698