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

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

Issue 968653004: Revert of Remove dependency on //components/feedback on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/chrome_browser.gypi » ('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 8
9 gypi_values = exec_script("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
10 [ rebase_path("../../chrome_browser_ui.gypi") ], 10 [ rebase_path("../../chrome_browser_ui.gypi") ],
(...skipping 29 matching lines...) Expand all
40 "//chrome:resources", 40 "//chrome:resources",
41 "//chrome:strings", 41 "//chrome:strings",
42 "//chrome/app/resources:platform_locale_settings", 42 "//chrome/app/resources:platform_locale_settings",
43 "//chrome/app/theme:theme_resources", 43 "//chrome/app/theme:theme_resources",
44 "//chrome/browser/net:cert_logger_proto", 44 "//chrome/browser/net:cert_logger_proto",
45 "//chrome/common", 45 "//chrome/common",
46 "//chrome/common/net", 46 "//chrome/common/net",
47 "//components/app_modal", 47 "//components/app_modal",
48 "//components/auto_login_parser", 48 "//components/auto_login_parser",
49 "//components/dom_distiller/webui", 49 "//components/dom_distiller/webui",
50 "//components/feedback/proto",
50 "//components/history/core/browser:proto", 51 "//components/history/core/browser:proto",
51 "//components/invalidation", 52 "//components/invalidation",
52 "//components/onc", 53 "//components/onc",
53 "//components/password_manager/core/browser", 54 "//components/password_manager/core/browser",
54 "//components/resources", 55 "//components/resources",
55 "//components/strings", 56 "//components/strings",
56 "//components/update_client", 57 "//components/update_client",
57 "//content/public/browser", 58 "//content/public/browser",
58 "//content/public/common", 59 "//content/public/common",
59 "//crypto", 60 "//crypto",
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (!is_android && !is_ios) { 128 if (!is_android && !is_ios) {
128 sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources, 129 sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources,
129 ".", 130 ".",
130 "//chrome") 131 "//chrome")
131 sources += 132 sources +=
132 rebase_path(gypi_values.chrome_browser_ui_omnibox_non_mobile_sources, 133 rebase_path(gypi_values.chrome_browser_ui_omnibox_non_mobile_sources,
133 ".", 134 ".",
134 "//chrome") 135 "//chrome")
135 deps += [ 136 deps += [
136 "//components/copresence", 137 "//components/copresence",
137 "//components/feedback/proto",
138 "//device/bluetooth", 138 "//device/bluetooth",
139 "//third_party/libusb", 139 "//third_party/libusb",
140 ] 140 ]
141 } 141 }
142 142
143 if (enable_basic_printing || enable_print_preview) { 143 if (enable_basic_printing || enable_print_preview) {
144 deps += [ "//printing" ] 144 deps += [ "//printing" ]
145 } 145 }
146 146
147 if (enable_one_click_signin) { 147 if (enable_one_click_signin) {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 309
310 if (is_android) { 310 if (is_android) {
311 deps += [ 311 deps += [
312 "//chrome/browser:jni_headers", 312 "//chrome/browser:jni_headers",
313 "//crypto:platform", 313 "//crypto:platform",
314 314
315 #'../components/components.gyp:web_contents_delegate_android', TODO(GYP) 315 #'../components/components.gyp:web_contents_delegate_android', TODO(GYP)
316 ] 316 ]
317 deps -= [ 317 deps -= [
318 "//chrome/browser/ui/views", 318 "//chrome/browser/ui/views",
319 "//components/feedback/proto",
319 "//ui/events", 320 "//ui/events",
320 ] 321 ]
321 sources += rebase_path(gypi_values.chrome_browser_ui_android_sources, 322 sources += rebase_path(gypi_values.chrome_browser_ui_android_sources,
322 ".", 323 ".",
323 "//chrome") 324 "//chrome")
324 325
325 defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ] 326 defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ]
326 } 327 }
327 328
328 if (is_mac) { 329 if (is_mac) {
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 "//chrome/browser", 517 "//chrome/browser",
517 "//content/public/browser", 518 "//content/public/browser",
518 "//content/public/common", 519 "//content/public/common",
519 "//content/test:test_support", 520 "//content/test:test_support",
520 "//net:test_support", 521 "//net:test_support",
521 "//skia", 522 "//skia",
522 "//testing/gtest", 523 "//testing/gtest",
523 "//ui/base", 524 "//ui/base",
524 ] 525 ]
525 } 526 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698