diff options
author | Brett Wilson <brettw@chromium.org> | 2014-09-23 16:41:46 -0700 |
---|---|---|
committer | Brett Wilson <brettw@chromium.org> | 2014-09-23 23:42:24 +0000 |
commit | e5389527466d390b5653724a069008b9f1edcd5c (patch) | |
tree | b801a034992eec680db3afbfae5ed6dd6394ca7e /chrome/browser/ui | |
parent | 2261d6bc3936efca1a9387085d2ebbf367d38df4 (diff) | |
download | chromium_src-e5389527466d390b5653724a069008b9f1edcd5c.zip chromium_src-e5389527466d390b5653724a069008b9f1edcd5c.tar.gz chromium_src-e5389527466d390b5653724a069008b9f1edcd5c.tar.bz2 |
Replace forward_dependent_configs with public_deps
This is the new name. It has the same meaning but additionally with a "you can use the headers" permission.
Rename direct_dependent_configs to public_configs. This is the new name with identical meaning.
TBR=jamesr
Review URL: https://codereview.chromium.org/595073002
Cr-Commit-Position: refs/heads/master@{#296302}
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r-- | chrome/browser/ui/BUILD.gn | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 1c5733f..dbd8d43 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -18,7 +18,6 @@ static_library("ui") { sources = [] defines = [] libs = [] - forward_dependent_configs_from = [] configs += [ "//build/config/compiler:wexit_time_destructors" ] @@ -27,6 +26,10 @@ static_library("ui") { # However, this means browser_ui and browser should more or less # have the same dependencies. Once browser_ui is untangled from # browser, then we can clean up these dependencies. + public_deps = [ + "//components/dom_distiller/core", + "//sync", + ] deps = [ # NOTE: New dependencies should generally be added in the OS!="ios" # dependencies block below, rather than here. @@ -41,7 +44,6 @@ static_library("ui") { "//chrome/common", "//chrome/common/net", "//components/auto_login_parser", - "//components/dom_distiller/core", "//components/dom_distiller/webui", "//components/feedback/proto", "//components/invalidation", @@ -54,7 +56,6 @@ static_library("ui") { "//content/public/common", "//crypto", "//skia", - "//sync", "//third_party/cacheinvalidation", "//third_party/icu", "//third_party/libusb", @@ -72,11 +73,6 @@ static_library("ui") { "//ui/strings", ] - forward_dependent_configs_from = [ - "//components/dom_distiller/core", - "//sync", - ] - if (!is_ios) { sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources, ".", "//chrome") @@ -311,28 +307,22 @@ static_library("ui") { if (is_win) { sources += rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome") + public_deps += [ + "//ui/views", + "//ui/views/controls/webview", + ] deps += [ "//chrome/installer/util:strings", "//third_party/wtl", "//third_party/iaccessible2", "//third_party/isimpledom", "//ui/app_list", - "//ui/views", - "//ui/views/controls/webview", #'metro_utils', TODO(GYP) #'../google_update/google_update.gyp:google_update', TODO(GYP) ] - forward_dependent_configs_from += [ - "//ui/views", - "//ui/views/controls/webview", - ] } else { # 'OS!="win" if (toolkit_views) { - deps += [ - "//ui/views", - "//ui/views/controls/webview", - ] - forward_dependent_configs_from += [ + public_deps += [ "//ui/views", "//ui/views/controls/webview", ] @@ -454,8 +444,10 @@ source_set("test_support") { "website_settings/mock_permission_bubble_request.h", ] - deps = [ + public_deps = [ ":ui", + ] + deps = [ "//chrome/app/theme:theme_resources", "//chrome/browser", "//content/public/browser", @@ -466,8 +458,4 @@ source_set("test_support") { "//testing/gtest", "//ui/base", ] - - forward_dependent_configs_from = [ - ":ui", - ] } |