From 552906b0f222c5d5dd11b9fd73829d510980461a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 16 Jul 2020 11:45:35 +0200 Subject: BASELINE: Update Chromium to 83.0.4103.122 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e Reviewed-by: Michael BrĂ¼ning --- chromium/ios/chrome/browser/ui/table_view/BUILD.gn | 16 ++++++---------- chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn | 12 +++++------- 2 files changed, 11 insertions(+), 17 deletions(-) (limited to 'chromium/ios/chrome/browser/ui/table_view') diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn index 43a6b7c48c4..1362a376f45 100644 --- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn @@ -22,7 +22,7 @@ source_set("table_view") { "//base", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/material_components", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] public_deps = [ @@ -49,7 +49,7 @@ source_set("styler") { ] public_deps = [ "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", ] } @@ -67,7 +67,7 @@ source_set("presentation") { "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/resources:menu_shadow", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] } @@ -85,7 +85,7 @@ source_set("views") { "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] } @@ -96,9 +96,7 @@ source_set("feature_flags") { "feature_flags.h", "feature_flags.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("test_support") { @@ -121,9 +119,7 @@ source_set("test_support") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "chrome_table_view_controller_unittest.mm", - ] + sources = [ "chrome_table_view_controller_unittest.mm" ] deps = [ ":table_view", ":test_support", diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn index ae39e7b95f4..b51aef8fcbf 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -58,9 +58,9 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//net", "//ui/base", @@ -74,9 +74,7 @@ source_set("cells_constants") { "table_view_cells_constants.h", "table_view_cells_constants.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -101,7 +99,7 @@ source_set("unit_tests") { ":cells_constants", "//base", "//ios/chrome/browser/ui/table_view:styler", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//net:net", "//testing/gtest", "//third_party/ocmock:ocmock", -- cgit v1.2.1