chromium/src
0
Fork 0
Code Activity

Reland: [ios] Use framework style includes for MDC headers

Browse Source 
This is a follow up cleanup which will allow removing some GN targets.

Original CL broke downstream chrome for iOS tree. A change has been
landed downstream to prevent the breakage after reland:
https://chrome-internal-review.googlesource.com/c/chrome/ios_internal/+/3102155

Original CL: https://chromium-review.googlesource.com/c/chromium/src/+/2232862

TBR: yuweih@chromium.org
Bug: 1017165
Change-Id: Ibc8504b9077c59a4cb1da5fbe746106758fdcaf9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2241336
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#777461}
This commit is contained in:
Eugene But
2020-06-11 20:05:34 +00:00
committed by Commit Bot
parent 6094a5eb7a
commit 71decb3a39
121 changed files with 372 additions and 309 deletions
ios
chrome
app
BUILD.gnchrome_overlay_window.h
spotlight
base_spotlight_manager.mm
browser
passwords
notify_auto_signin_view_controller.mm
ui
authentication
cells
signin_promo_view_unittest.mm
chrome_signin_view_controller.mmsigned_in_accounts_view_controller.mm
signin
user_signin
user_signin_view_controller.mm
unified_consent
identity_picker_view.mm
autofill
card_unmask_prompt_view_bridge.mm
cells
cvc_item.hcvc_item.mmlegacy_autofill_edit_item.hlegacy_autofill_edit_item.mmstatus_item.hstatus_item.mmstatus_item_unittest.mm
save_card_infobar_view.mm
bookmarks
bookmark_home_waiting_view.mmbookmark_interaction_controller.mmbookmark_mediator.mmbookmark_utils_ios.mm
browser_view
browser_view_controller.mm
collection_view
cells
MDCCollectionViewCell+Chrome.hcollection_view_account_item.hcollection_view_account_item.mmcollection_view_footer_item.hcollection_view_footer_item.mmcollection_view_item.mmcollection_view_item_unittest.mmcollection_view_switch_item.hcollection_view_switch_item.mmcollection_view_text_cell.h
collection_view_controller.hcollection_view_controller.mmcollection_view_controller_test.hcollection_view_controller_unittest.mm
colors
BUILD.gnMDCPalette+CrAdditions.h
content_suggestions
cells
content_suggestions_articles_header_item.hcontent_suggestions_cell.hcontent_suggestions_cell.mmcontent_suggestions_discover_item.hcontent_suggestions_footer_item.hcontent_suggestions_footer_item.mmcontent_suggestions_header_item.hcontent_suggestions_learn_more_item.hcontent_suggestions_learn_more_item.mmcontent_suggestions_most_visited_action_cell.hcontent_suggestions_most_visited_cell.hcontent_suggestions_whats_new_item.hcontent_suggestions_whats_new_item.mm
content_suggestions_collection_updater.mmcontent_suggestions_layout.hntp_home_mediator.mm
download
download_manager_view_controller.mm
elements
activity_overlay_view_controller.mm
fancy_ui
primary_action_button.h
first_run
static_file_view_controller.mmwelcome_to_chrome_view.mm
infobars
confirm_infobar_view.mm
coordinators
infobar_translate_coordinator.mm
material_components
activity_indicator.mmchrome_app_bar_view_controller.hutils.mm
ntp_tile_views
ntp_shortcut_tile_view.mm
open_in
open_in_toolbar.mm
page_info
legacy_page_info_view_controller.mm
sad_tab
sad_tab_view.mm
send_tab_to_self
send_tab_to_self_coordinator.mm
settings
about_chrome_table_view_controller.mm
password
password_details_table_view_controller.mmpasswords_settings_app_interface.mm
translate_table_view_controller.mm
snackbar
snackbar_coordinator.mm
table_view
cells
table_view_activity_indicator_header_footer_item.mm
table_view_loading_view.mm
tabs
tab_view.mm
toolbar
adaptive_toolbar_view_controller.mmprimary_toolbar_view_controller.mmtoolbar_progress_bar.h
translate
translate_infobar_language_tab_view.mmtranslate_notification_presenter.mm
util
manual_text_framer_unittest.mmtext_region_mapper_unittest.mm
web
progress_indicator_app_interface.mm
test
app
BUILD.gn
showcase
core
app_delegate.mm
third_party
material_components_ios
BUILD.gn
remoting/ios
app
client_connection_view_controller.mmfirst_launch_view_controller.mmhost_collection_header_view.mmhost_collection_view_cell.hhost_collection_view_cell.mmhost_collection_view_controller.hhost_collection_view_controller.mmhost_fetching_error_view_controller.mmhost_fetching_view_controller.mmhost_setup_footer_view.mmhost_setup_header_view.mmhost_setup_view_cell.mmhost_setup_view_controller.mmhost_view_controller.mmnotification_dialog_view_controller.mmnotification_presenter.mmpin_entry_view.mmremoting_menu_view_controller.hremoting_menu_view_controller.mmremoting_theme.mmremoting_view_controller.hremoting_view_controller.mmsession_reconnect_view.mm
settings
remoting_settings_view_controller.hremoting_settings_view_controller.mmsettings_view_cell.hsettings_view_cell.mm
side_menu_items.mmuser_status_presenter.mm
facade
remoting_oauth_authentication.mm
mdc
MDCActionImageView.m
session
remoting_client.mm

1
ios/chrome/app/BUILD.gn

@ -59,6 +59,7 @@ source_set("unit_tests") {
"//ios/public/provider/chrome/browser:test_support",
"//ios/public/provider/chrome/browser/distribution",
"//ios/testing:block_swizzler",
"//ios/third_party/material_components_ios",
"//ios/web/public/test:test",
"//testing/gtest",
"//third_party/ocmock",

2
ios/chrome/app/chrome_overlay_window.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_APP_CHROME_OVERLAY_WINDOW_H_
#define IOS_CHROME_APP_CHROME_OVERLAY_WINDOW_H_
#import "ios/third_party/material_components_ios/src/components/OverlayWindow/src/MaterialOverlayWindow.h"
#import <MaterialComponents/MaterialOverlayWindow.h>
// Tracks size classes changes then reports to SizeClassRecorder and Breakpad.
@interface ChromeOverlayWindow : MDCOverlayWindow

3
ios/chrome/app/spotlight/base_spotlight_manager.mm

@ -6,6 +6,8 @@
#import <MobileCoreServices/MobileCoreServices.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/bind.h"
#include "base/hash/md5.h"
#include "base/strings/sys_string_conversions.h"
@ -17,7 +19,6 @@
#include "ios/chrome/grit/ios_strings.h"
#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#include "ios/public/provider/chrome/browser/spotlight/spotlight_provider.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import "net/base/mac/url_conversions.h"
#include "skia/ext/skia_utils_ios.h"
#include "ui/base/l10n/l10n_util.h"

3
ios/chrome/browser/passwords/notify_auto_signin_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/passwords/notify_auto_signin_view_controller.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/bind.h"
#include "base/strings/sys_string_conversions.h"
#include "components/image_fetcher/core/image_fetcher_impl.h"
@ -12,7 +14,6 @@
#import "ios/chrome/browser/ui/util/rtl_geometry.h"
#include "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/image/image.h"

3
ios/chrome/browser/ui/authentication/cells/signin_promo_view_unittest.mm

@ -4,8 +4,9 @@
#import "ios/chrome/browser/ui/authentication/cells/signin_promo_view.h"
#import <MaterialComponents/MaterialOverlayWindow.h>
#import "ios/chrome/browser/ui/authentication/cells/signin_promo_view_constants.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#include "testing/platform_test.h"
#include "third_party/ocmock/gtest_support.h"

7
ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

@ -11,6 +11,10 @@
#import <CoreGraphics/CoreGraphics.h>
#import <QuartzCore/QuartzCore.h>
#import <MaterialComponents/MaterialActivityIndicator.h>
#import <MaterialComponents/MaterialButtons.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/bind.h"
#include "base/feature_list.h"
#import "base/ios/block_types.h"
@ -54,9 +58,6 @@
#import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
#import "ios/public/provider/chrome/browser/signin/chrome_identity_interaction_manager.h"
#import "ios/public/provider/chrome/browser/signin/chrome_identity_service.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

5
ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.h"
#import <MaterialComponents/MaterialDialogs.h>
#import <MaterialComponents/MaterialTypography.h>
#import "base/mac/foundation_util.h"
#include "components/signin/public/identity_manager/identity_manager.h"
#import "components/signin/public/identity_manager/objc/identity_manager_observer_bridge.h"
@ -27,8 +30,6 @@
#import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
#import "ios/public/provider/chrome/browser/signin/chrome_identity_service.h"
#include "ios/public/provider/chrome/browser/signin/signin_resources_provider.h"
#import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util_mac.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_view_controller.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#include "base/feature_list.h"
#import "base/logging.h"
#import "ios/chrome/browser/ui/authentication/signin/signin_constants.h"
@ -16,7 +18,6 @@
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/common/ui/util/pointer_interaction_util.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#import "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/authentication/unified_consent/identity_picker_view.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/authentication/unified_consent/identity_picker_view.h"
#import <MaterialComponents/MaterialInk.h>
#include "base/check.h"
#include "base/feature_list.h"
#import "ios/chrome/browser/ui/authentication/authentication_constants.h"
@ -14,7 +16,6 @@
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/common/ui/util/pointer_interaction_util.h"
#import "ios/third_party/material_components_ios/src/components/Ink/src/MaterialInk.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.mm

@ -4,6 +4,8 @@
#include "ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/bind.h"
#include "base/location.h"
#include "base/mac/foundation_util.h"
@ -21,7 +23,6 @@
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
#import "ios/chrome/browser/ui/util/rtl_geometry.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/autofill/cells/cvc_item.h

@ -7,8 +7,9 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
// Item corresponding to a CVCCell.
@interface CVCItem : CollectionViewItem

3
ios/chrome/browser/ui/autofill/cells/cvc_item.mm

@ -4,12 +4,13 @@
#import "ios/chrome/browser/ui/autofill/cells/cvc_item.h"
#import <MaterialComponents/MaterialTypography.h>
#include "components/strings/grit/components_strings.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/autofill/cells/legacy_autofill_edit_item.h

@ -7,9 +7,10 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/autofill/autofill_ui_type.h"
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
// Item to represent and configure an LegacyAutofillEditItem. It features a
// label and a text field.

3
ios/chrome/browser/ui/autofill/cells/legacy_autofill_edit_item.mm

@ -4,13 +4,14 @@
#import "ios/chrome/browser/ui/autofill/cells/legacy_autofill_edit_item.h"
#import <MaterialComponents/MaterialTypography.h>
#include "ios/chrome/browser/ui/collection_view/cells/collection_view_cell_constants.h"
#import "ios/chrome/browser/ui/util/rtl_geometry.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/autofill/cells/status_item.h

@ -7,8 +7,9 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
enum class StatusItemState {
VERIFYING,

5
ios/chrome/browser/ui/autofill/cells/status_item.mm

@ -4,12 +4,13 @@
#import "ios/chrome/browser/ui/autofill/cells/status_item.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/check.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#include "ios/chrome/grit/ios_theme_resources.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/autofill/cells/status_item_unittest.mm

@ -4,8 +4,9 @@
#import "ios/chrome/browser/ui/autofill/cells/status_item.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#include "base/mac/foundation_util.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
#include "testing/platform_test.h"

5
ios/chrome/browser/ui/autofill/save_card_infobar_view.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/autofill/save_card_infobar_view.h"
#import <MaterialComponents/MaterialButtons.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/check_op.h"
#include "base/feature_list.h"
#include "components/strings/grit/components_strings.h"
@ -20,8 +23,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/common/ui/util/pointer_interaction_util.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#import "ui/gfx/ios/uikit_util.h"
#include "url/gurl.h"

5
ios/chrome/browser/ui/bookmarks/bookmark_home_waiting_view.mm

@ -4,12 +4,13 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_home_waiting_view.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#import <MaterialComponents/MaterialPalettes.h>
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/chrome/browser/ui/material_components/activity_indicator.h"
#import "ios/chrome/browser/ui/util/rtl_geometry.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm

@ -6,6 +6,8 @@
#include <stdint.h>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/check_op.h"
#include "base/mac/foundation_util.h"
#include "base/metrics/user_metrics.h"
@ -43,7 +45,6 @@
#import "ios/chrome/browser/url_loading/url_loading_util.h"
#import "ios/chrome/browser/web_state_list/web_state_list.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#import "ios/web/public/navigation/navigation_manager.h"
#include "ios/web/public/navigation/referrer.h"
#import "ios/web/public/web_state.h"

3
ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_mediator.h"
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
#include "base/strings/sys_string_conversions.h"
@ -20,7 +22,6 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
#include "ios/chrome/browser/ui/util/uikit_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.mm

@ -9,6 +9,8 @@
#include <memory>
#include <vector>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/hash/hash.h"
#include "base/i18n/string_compare.h"
#include "base/metrics/user_metrics_action.h"
@ -25,7 +27,6 @@
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_mac.h"

3
ios/chrome/browser/ui/browser_view/browser_view_controller.mm

@ -7,6 +7,8 @@
#import <MessageUI/MessageUI.h>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/base64.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
@ -166,7 +168,6 @@
#import "ios/public/provider/chrome/browser/ui/fullscreen_provider.h"
#include "ios/public/provider/chrome/browser/voice/voice_search_controller.h"
#include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ios/web/common/url_scheme_util.h"
#import "ios/web/public/deprecated/crw_js_injection_receiver.h"
#import "ios/web/public/deprecated/crw_web_controller_util.h"

2
ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h

@ -7,7 +7,7 @@
#import <CoreGraphics/CoreGraphics.h>
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#import <MaterialComponents/MaterialCollectionCells.h>
@class CollectionViewItem;

3
ios/chrome/browser/ui/collection_view/cells/collection_view_account_item.h

@ -7,8 +7,9 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class ChromeIdentity;

5
ios/chrome/browser/ui/collection_view/cells/collection_view_account_item.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_account_item.h"
#import <MaterialComponents/MaterialPalettes.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/mac/foundation_util.h"
#import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
#include "ios/chrome/browser/ui/collection_view/cells/collection_view_cell_constants.h"
@ -11,8 +14,6 @@
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h

@ -7,8 +7,9 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#include "url/gurl.h"
@class CollectionViewFooterCell;

3
ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.mm

@ -4,13 +4,14 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h"
#import <MaterialComponents/MaterialTypography.h>
#include "ios/chrome/browser/ui/collection_view/cells/collection_view_cell_constants.h"
#import "ios/chrome/browser/ui/util/label_link_controller.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/string_util.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/collection_view/cells/collection_view_item.mm

@ -4,8 +4,9 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import <MaterialComponents/MaterialCollectionCells.h>
#include "base/check.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/collection_view/cells/collection_view_item_unittest.mm

@ -4,7 +4,8 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#import <MaterialComponents/MaterialCollectionCells.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
#include "testing/platform_test.h"

3
ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.h

@ -7,8 +7,9 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
// CollectionViewSwitchItem is the model class corresponding to
// CollectionViewSwitchCell.

3
ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm

@ -4,10 +4,11 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.h"
#import <MaterialComponents/MaterialTypography.h>
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util_mac.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

2
ios/chrome/browser/ui/collection_view/cells/collection_view_text_cell.h

@ -7,7 +7,7 @@
#import <UIKit/UIKit.h>
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MDCCollectionViewCell.h"
#import <MaterialComponents/MDCCollectionViewCell.h>
// MDCCollectionViewCell that displays two text fields.
@interface CollectionViewTextCell : MDCCollectionViewCell

3
ios/chrome/browser/ui/collection_view/collection_view_controller.h

@ -5,9 +5,10 @@
#ifndef IOS_CHROME_BROWSER_UI_COLLECTION_VIEW_COLLECTION_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_COLLECTION_VIEW_COLLECTION_VIEW_CONTROLLER_H_
#import <MaterialComponents/MaterialCollections.h>
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
#import "ios/chrome/browser/ui/material_components/app_bar_view_controller_presenting.h"
#import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
@class CollectionViewItem;

3
ios/chrome/browser/ui/collection_view/collection_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
#import <MaterialComponents/MaterialCollectionCells.h>
#include "base/check.h"
#include "base/mac/foundation_util.h"
#import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
@ -12,7 +14,6 @@
#import "ios/chrome/browser/ui/material_components/chrome_app_bar_view_controller.h"
#import "ios/chrome/browser/ui/material_components/utils.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/collection_view/collection_view_controller_test.h

@ -7,10 +7,11 @@
#import <Foundation/Foundation.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#include "base/compiler_specific.h"
#import "base/ios/block_types.h"
#import "ios/chrome/test/block_cleanup_test.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class CollectionViewController;

3
ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm

@ -4,11 +4,12 @@
#import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
#include "ios/chrome/test/block_cleanup_test.h"
#import "ios/testing/scoped_block_swizzler.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#include "testing/gtest/include/gtest/gtest.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

6
ios/chrome/browser/ui/colors/BUILD.gn

@ -8,8 +8,6 @@ source_set("colors") {
"MDCPalette+CrAdditions.h",
"MDCPalette+CrAdditions.mm",
]
deps = [
"//ios/third_party/material_components_ios",
"//ios/web",
]
deps = [ "//ios/web" ]
public_deps = [ "//ios/third_party/material_components_ios" ]
}

2
ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_COLORS_MDCPALETTE_CRADDITIONS_H_
#define IOS_CHROME_BROWSER_UI_COLORS_MDCPALETTE_CRADDITIONS_H_
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#import <MaterialComponents/MaterialPalettes.h>
// Access to overridable palettes.
@interface MDCPalette (CrAdditions)

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_articles_header_item.h

@ -5,8 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_ARTICLES_HEADER_ITEM_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_ARTICLES_HEADER_ITEM_H_
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class ContentSuggestionsArticlesHeaderCell;

2
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_cell.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_CELL_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_CELL_H_
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#import <MaterialComponents/MaterialCollectionCells.h>
@class FaviconView;

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_cell.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_cell.h"
#import <MaterialComponents/MaterialTypography.h>
#import "ios/chrome/browser/ui/ui_feature_flags.h"
#import "ios/chrome/browser/ui/util/i18n_string.h"
#include "ios/chrome/browser/ui/util/ui_util.h"
@ -11,7 +13,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/favicon/favicon_view.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_discover_item.h

@ -7,9 +7,10 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/chrome/browser/ui/content_suggestions/cells/suggested_content.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class ContentSuggestionsDiscoverCell;

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_footer_item.h

@ -5,8 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_FOOTER_ITEM_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_FOOTER_ITEM_H_
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class ContentSuggestionsFooterCell;

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_footer_item.mm

@ -4,11 +4,12 @@
#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_footer_item.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#include "ios/chrome/browser/ui/util/ui_util.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_header_item.h

@ -5,8 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_HEADER_ITEM_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_HEADER_ITEM_H_
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
// Item to display a view cell.
@interface ContentSuggestionsHeaderItem : CollectionViewItem

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_learn_more_item.h

@ -7,9 +7,10 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/chrome/browser/ui/content_suggestions/cells/suggested_content.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
// Item displaying the text showing a label inviting the user to ask for
// information about the suggested content.

5
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_learn_more_item.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_learn_more_item.h"
#import <MaterialComponents/MaterialPalettes.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/check_op.h"
#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_constants.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
@ -11,8 +14,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

2
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_cell.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_MOST_VISITED_ACTION_CELL_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_MOST_VISITED_ACTION_CELL_H_
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#import <MaterialComponents/MaterialCollectionCells.h>
// Associated cell to display a Most Visited Action tile based.
@interface ContentSuggestionsMostVisitedActionCell : MDCCollectionViewCell

2
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_cell.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_MOST_VISITED_CELL_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_MOST_VISITED_CELL_H_
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#import <MaterialComponents/MaterialCollectionCells.h>
@class FaviconView;

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_whats_new_item.h

@ -5,9 +5,10 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_WHATS_NEW_ITEM_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CELLS_CONTENT_SUGGESTIONS_WHATS_NEW_ITEM_H_
#import <MaterialComponents/MaterialCollectionCells.h>
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/chrome/browser/ui/content_suggestions/cells/suggested_content.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
// Item to display what is new in the ContentSuggestions.
@interface ContentSuggestionsWhatsNewItem : CollectionViewItem<SuggestedContent>

3
ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_whats_new_item.mm

@ -4,12 +4,13 @@
#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_whats_new_item.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/check_op.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#include "ios/chrome/common/string_util.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

5
ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h"
#import <MaterialComponents/MaterialPalettes.h>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/check.h"
#include "base/mac/foundation_util.h"
#include "base/strings/sys_string_conversions.h"
@ -27,8 +30,6 @@
#import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h"
#import "ios/chrome/browser/ui/list_model/list_item+Controller.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

2
ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_LAYOUT_H_
#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_LAYOUT_H_
#import "ios/third_party/material_components_ios/src/components/Collections/src/MDCCollectionViewFlowLayout.h"
#import <MaterialComponents/MDCCollectionViewFlowLayout.h>
// Layout used for ContentSuggestions. It makes sure the collection is high
// enough to be scrolled up to the point the fake omnibox is hidden. For size

3
ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm

@ -6,6 +6,8 @@
#include <memory>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/mac/foundation_util.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
@ -50,7 +52,6 @@
#include "ios/chrome/grit/ios_strings.h"
#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#import "ios/public/provider/chrome/browser/signin/signin_resources_provider.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#import "ios/web/public/navigation/navigation_item.h"
#import "ios/web/public/navigation/navigation_manager.h"
#include "ios/web/public/navigation/referrer.h"

5
ios/chrome/browser/ui/download/download_manager_view_controller.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/download/download_manager_view_controller.h"
#import <MaterialComponents/MaterialPalettes.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/feature_list.h"
#include "base/metrics/histogram_functions.h"
#include "base/notreached.h"
@ -19,8 +22,6 @@
#include "ios/chrome/grit/ios_strings.h"
#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#import "ios/public/provider/chrome/browser/images/branded_image_provider.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util_mac.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/elements/activity_overlay_view_controller.mm

@ -4,9 +4,10 @@
#import "ios/chrome/browser/ui/elements/activity_overlay_view_controller.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#import "ios/chrome/browser/ui/material_components/activity_indicator.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

2
ios/chrome/browser/ui/fancy_ui/primary_action_button.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_FANCY_UI_PRIMARY_ACTION_BUTTON_H_
#define IOS_CHROME_BROWSER_UI_FANCY_UI_PRIMARY_ACTION_BUTTON_H_
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import <MaterialComponents/MaterialButtons.h>
@interface PrimaryActionButton : MDCFlatButton

3
ios/chrome/browser/ui/first_run/static_file_view_controller.mm

@ -6,13 +6,14 @@
#import <WebKit/WebKit.h>
#import <MaterialComponents/MDCAppBarViewController.h>
#include "base/check.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/ui/icons/chrome_icon.h"
#import "ios/chrome/browser/ui/material_components/utils.h"
#include "ios/chrome/browser/ui/util/rtl_geometry.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/third_party/material_components_ios/src/components/AppBar/src/MDCAppBarViewController.h"
#import "ios/web/common/web_view_creation_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/first_run/welcome_to_chrome_view.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/check_op.h"
#include "base/i18n/rtl.h"
#include "base/notreached.h"
@ -19,7 +21,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"

3
ios/chrome/browser/ui/infobars/confirm_infobar_view.mm

@ -7,6 +7,8 @@
#import <CoreGraphics/CoreGraphics.h>
#import <QuartzCore/QuartzCore.h>
#import <MaterialComponents/MaterialButtons.h>
#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/format_macros.h"
@ -25,7 +27,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/pointer_interaction_util.h"
#include "ios/chrome/grit/ios_theme_resources.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#import "ui/gfx/ios/NSString+CrStringDrawing.h"

3
ios/chrome/browser/ui/infobars/coordinators/infobar_translate_coordinator.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/infobars/coordinators/infobar_translate_coordinator.h"
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
#include "base/strings/sys_string_conversions.h"
@ -29,7 +31,6 @@
#import "ios/chrome/browser/ui/infobars/modals/infobar_translate_table_view_controller.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/material_components/activity_indicator.mm

@ -4,9 +4,10 @@
#import "ios/chrome/browser/ui/material_components/activity_indicator.h"
#import <MaterialComponents/MaterialPalettes.h>
#include "build/branding_buildflags.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

2
ios/chrome/browser/ui/material_components/chrome_app_bar_view_controller.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_MATERIAL_COMPONENTS_CHROME_APP_BAR_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_MATERIAL_COMPONENTS_CHROME_APP_BAR_VIEW_CONTROLLER_H_
#import "ios/third_party/material_components_ios/src/components/AppBar/src/MDCAppBarViewController.h"
#import <MaterialComponents/MDCAppBarViewController.h>
// Used as substitute to MDCAppBarViewController to prevent default behavior of
// managing accessibility dismiss gesture itself. Usually the view controller or

13
ios/chrome/browser/ui/material_components/utils.mm

@ -6,14 +6,15 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MDCAppBarContainerViewController.h>
#import <MaterialComponents/MaterialAppBar.h>
#import <MaterialComponents/MaterialCollections.h>
#import <MaterialComponents/MaterialFlexibleHeader.h>
#import <MaterialComponents/MaterialPalettes.h>
#import <MaterialComponents/MaterialShadowLayer.h>
#include "base/mac/foundation_util.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/third_party/material_components_ios/src/components/AppBar/src/MDCAppBarContainerViewController.h"
#import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
#import "ios/third_party/material_components_ios/src/components/FlexibleHeader/src/MaterialFlexibleHeader.h"
#import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
#import "ios/third_party/material_components_ios/src/components/ShadowLayer/src/MaterialShadowLayer.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/ntp_tile_views/ntp_shortcut_tile_view.mm

@ -4,9 +4,10 @@
#import "ios/chrome/browser/ui/ntp_tile_views/ntp_shortcut_tile_view.h"
#import <MaterialComponents/MaterialTypography.h>
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/open_in/open_in_toolbar.mm

@ -6,6 +6,8 @@
#include <cmath>
#import <MaterialComponents/MaterialButtons.h>
#include "base/check.h"
#include "base/notreached.h"
#import "ios/chrome/browser/ui/util/named_guide.h"
@ -14,7 +16,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#include "ui/base/l10n/l10n_util_mac.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/page_info/legacy_page_info_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/page_info/legacy_page_info_view_controller.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/bind.h"
#include "base/location.h"
#include "base/mac/bundle_locations.h"
@ -25,7 +27,6 @@
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_mac.h"
#import "ui/gfx/ios/NSString+CrStringDrawing.h"

5
ios/chrome/browser/ui/sad_tab/sad_tab_view.mm

@ -4,6 +4,9 @@
#import "ios/chrome/browser/ui/sad_tab/sad_tab_view.h"
#import <MaterialComponents/MaterialButtons.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/feature_list.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/sys_string_conversions.h"
@ -19,8 +22,6 @@
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/pointer_interaction_util.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ios/web/public/browser_state.h"
#include "ios/web/public/navigation/navigation_manager.h"
#include "ui/base/l10n/l10n_util.h"

3
ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_coordinator.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_coordinator.h"
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/check.h"
#include "base/strings/sys_string_conversions.h"
#include "components/send_tab_to_self/send_tab_to_self_sync_service.h"
@ -20,7 +22,6 @@
#import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/settings/about_chrome_table_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/settings/about_chrome_table_view_controller.h"
#import <MaterialComponents/MaterialSnackbar.h>
#import "base/ios/block_types.h"
#import "base/mac/foundation_util.h"
#include "base/notreached.h"
@ -23,7 +25,6 @@
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "url/gurl.h"

3
ios/chrome/browser/ui/settings/password/password_details_table_view_controller.mm

@ -6,6 +6,8 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/ios/ios_util.h"
#include "base/mac/foundation_util.h"
#include "base/metrics/histogram_macros.h"
@ -29,7 +31,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/reauthentication/reauthentication_module.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/clipboard/clipboard_constants.h"
#include "ui/base/l10n/l10n_util_mac.h"

3
ios/chrome/browser/ui/settings/password/passwords_settings_app_interface.mm

@ -4,6 +4,8 @@
#include "ios/chrome/browser/ui/settings/password/passwords_settings_app_interface.h"
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#import "base/test/ios/wait_util.h"
@ -17,7 +19,6 @@
#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
#import "ios/chrome/test/app/chrome_test_util.h"
#import "ios/chrome/test/app/password_test_util.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "url/gurl.h"
#include "url/origin.h"

4
ios/chrome/browser/ui/settings/translate_table_view_controller.mm

@ -5,8 +5,11 @@
#import "ios/chrome/browser/ui/settings/translate_table_view_controller.h"
#import <Foundation/Foundation.h>
#include <memory>
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/mac/foundation_util.h"
#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_member.h"
@ -28,7 +31,6 @@
#include "ios/chrome/browser/ui/util/uikit_ui_util.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"

3
ios/chrome/browser/ui/snackbar/snackbar_coordinator.mm

@ -4,11 +4,12 @@
#import "ios/chrome/browser/ui/snackbar/snackbar_coordinator.h"
#import <MaterialComponents/MaterialSnackbar.h>
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/ui/commands/command_dispatcher.h"
#import "ios/chrome/browser/ui/commands/snackbar_commands.h"
#import "ios/chrome/browser/ui/util/named_guide.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/table_view/cells/table_view_activity_indicator_header_footer_item.mm

@ -4,13 +4,14 @@
#import "ios/chrome/browser/ui/table_view/cells/table_view_activity_indicator_header_footer_item.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#include "base/mac/foundation_util.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/chrome/browser/ui/table_view/cells/table_view_cells_constants.h"
#import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/table_view/table_view_loading_view.mm

@ -4,10 +4,11 @@
#import "ios/chrome/browser/ui/table_view/table_view_loading_view.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/chrome/browser/ui/material_components/activity_indicator.h"
#import "ios/chrome/browser/ui/util/rtl_geometry.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

4
ios/chrome/browser/ui/tabs/tab_view.mm

@ -5,9 +5,10 @@
#import "ios/chrome/browser/ui/tabs/tab_view.h"
#include "base/i18n/rtl.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#include "base/feature_list.h"
#include "base/i18n/rtl.h"
#include "base/ios/ios_util.h"
#include "base/strings/sys_string_conversions.h"
#include "ios/chrome/browser/drag_and_drop/drop_and_navigate_delegate.h"
@ -22,7 +23,6 @@
#import "ios/chrome/common/ui/elements/highlight_button.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h"

3
ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.h"
#import <MaterialComponents/MaterialProgressView.h>
#include "base/metrics/user_metrics.h"
#include "base/notreached.h"
#import "ios/chrome/browser/ui/commands/browser_commands.h"
@ -22,7 +24,6 @@
#import "ios/chrome/browser/ui/util/force_touch_long_press_gesture_recognizer.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/material_timing.h"
#import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/toolbar/primary_toolbar_view_controller.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/toolbar/primary_toolbar_view_controller.h"
#import <MaterialComponents/MaterialProgressView.h>
#include "base/check.h"
#import "ios/chrome/browser/ui/commands/browser_commands.h"
#import "ios/chrome/browser/ui/commands/omnibox_commands.h"
@ -21,7 +23,6 @@
#import "ios/chrome/browser/ui/util/named_guide.h"
#import "ios/chrome/browser/ui/util/ui_util.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

2
ios/chrome/browser/ui/toolbar/toolbar_progress_bar.h

@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_PROGRESS_BAR_H_
#define IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_PROGRESS_BAR_H_
#import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
#import <MaterialComponents/MaterialProgressView.h>
// Progress bar for the toolbar, that indicate that the progress is about the
// page load when read via voice over.

3
ios/chrome/browser/ui/translate/translate_infobar_language_tab_view.mm

@ -4,6 +4,8 @@
#import "ios/chrome/browser/ui/translate/translate_infobar_language_tab_view.h"
#import <MaterialComponents/MaterialActivityIndicator.h>
#include "base/feature_list.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
#import "ios/chrome/browser/ui/translate/translate_infobar_language_tab_strip_view.h"
@ -13,7 +15,6 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/elements/highlight_button.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

3
ios/chrome/browser/ui/translate/translate_notification_presenter.mm

@ -4,12 +4,13 @@
#import "ios/chrome/browser/ui/translate/translate_notification_presenter.h"
#import <MaterialComponents/MaterialSnackbar.h>
#include "base/strings/sys_string_conversions.h"
#include "components/strings/grit/components_strings.h"
#import "ios/chrome/browser/ui/commands/snackbar_commands.h"
#import "ios/chrome/browser/ui/translate/translate_notification_delegate.h"
#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

3
ios/chrome/browser/ui/util/manual_text_framer_unittest.mm

@ -4,11 +4,12 @@
#include "ios/chrome/browser/ui/util/manual_text_framer.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/mac/foundation_util.h"
#include "base/time/time.h"
#import "ios/chrome/browser/ui/util/core_text_util.h"
#import "ios/chrome/browser/ui/util/text_frame.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
#include "testing/platform_test.h"

3
ios/chrome/browser/ui/util/text_region_mapper_unittest.mm

@ -4,9 +4,10 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialTypography.h>
#include "base/mac/foundation_util.h"
#include "ios/chrome/browser/ui/util/text_region_mapper.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
#include "testing/platform_test.h"

3
ios/chrome/browser/web/progress_indicator_app_interface.mm

@ -6,9 +6,10 @@
#import <UIKit/UIKit.h>
#import <MaterialComponents/MaterialProgressView.h>
#import "base/mac/foundation_util.h"
#import "ios/testing/earl_grey/earl_grey_app.h"
#import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."

1
ios/chrome/test/app/BUILD.gn

@ -91,6 +91,7 @@ source_set("test_support") {
"//ios/public/provider/chrome/browser",
"//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
"//ios/public/provider/chrome/browser/signin:test_support",
"//ios/third_party/material_components_ios",
"//ios/web",
"//ios/web/public/security",
"//ios/web/public/test",

3
ios/showcase/core/app_delegate.mm

@ -4,13 +4,14 @@
#import "ios/showcase/core/app_delegate.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/command_line.h"
#include "base/i18n/icu_util.h"
#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#import "ios/showcase/core/showcase_model.h"
#import "ios/showcase/core/showcase_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#include "ui/base/resource/resource_bundle.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)

20
ios/third_party/material_components_ios/BUILD.gn vendored

@ -1555,16 +1555,6 @@ _mdc_sources = [
"src/components/schemes/Typography/src/Scheming/MaterialTypographyScheme+Scheming.h",
]
config("public_configs") {
visibility = [ ":*" ]
# This is a hack to allow to include the header using the full path but
# still have them function as if they were included using framework style.
# TODO(crbug.com/1017165): remove once MaterialComponents is always built
# as a framework
include_dirs = [ "$root_out_dir/MaterialComponents.framework/Headers" ]
}
config("config") {
visibility = [ ":*" ]
include_dirs = _mdc_include_dirs
@ -1577,11 +1567,7 @@ config("disable_deprecated_errors") {
]
}
source_set("material_components_ios_public_headers") {
public = _mdc_public_headers
}
target("ios_framework_bundle", "material_components_ios") {
ios_framework_bundle("material_components_ios") {
sources = _mdc_sources
info_plist = "Info.plist"
@ -1605,10 +1591,6 @@ target("ios_framework_bundle", "material_components_ios") {
"//ios/third_party/motion_transitioning_objc",
]
public_deps = [ ":material_components_ios_public_headers" ]
public_configs = [ ":public_configs" ]
configs -= [
"//build/config/compiler:chromium_code",
"//build/config/gcc:symbol_visibility_hidden",

19
remoting/ios/app/client_connection_view_controller.mm

@ -2,16 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/client_connection_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MDCActivityIndicator.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
#import <MaterialComponents/MDCActivityIndicator.h>
#import <MaterialComponents/MDCNavigationBar.h>
#import <MaterialComponents/MaterialButtons.h>
#import <MaterialComponents/MaterialCollections.h>
#import <MaterialComponents/MaterialSnackbar.h>
#import "remoting/ios/app/help_and_feedback.h"
#import "remoting/ios/app/host_view_controller.h"
#import "remoting/ios/app/pin_entry_view.h"
@ -23,12 +21,15 @@
#import "remoting/ios/facade/remoting_authentication.h"
#import "remoting/ios/facade/remoting_service.h"
#import "remoting/ios/session/remoting_client.h"
#include "base/strings/sys_string_conversions.h"
#include "remoting/base/string_resources.h"
#include "remoting/protocol/client_authentication_config.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
static const CGFloat kIconRadius = 30.f;
static const CGFloat kActivityIndicatorStrokeWidth = 3.f;
static const CGFloat kActivityIndicatorRadius = 33.f;

16
remoting/ios/app/first_launch_view_controller.mm

@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "remoting/ios/app/first_launch_view_controller.h"
#import <MaterialComponents/MaterialButtons.h>
#include "remoting/base/string_resources.h"
#import "remoting/ios/app/remoting_theme.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/first_launch_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "remoting/ios/app/remoting_theme.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
static const float kLogoSizeMultiplier = 0.381966f;
static const float kLogoYOffset = -10.f;
static const float kButtonHeight = 80.f;

11
remoting/ios/app/host_collection_header_view.mm

@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/host_collection_header_view.h"
#import <UIKit/UIKit.h>
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import <MaterialComponents/MaterialTypography.h>
#import "remoting/ios/app/remoting_theme.h"
#import "remoting/ios/app/view_utils.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
// Applied on the left and right of the label.
static const float kTitleMargin = 12.f;

2
remoting/ios/app/host_collection_view_cell.h

@ -7,7 +7,7 @@
#import <UIKit/UIKit.h>
#import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
#import <MaterialComponents/MaterialCollections.h>
@class HostInfo;

19
remoting/ios/app/host_collection_view_cell.mm

@ -2,23 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import <UIKit/UIKit.h>
#import "remoting/ios/app/host_collection_view_cell.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import "remoting/ios/app/remoting_theme.h"
#import "remoting/ios/app/view_utils.h"
#import "remoting/ios/domain/host_info.h"
#import <MaterialComponents/MaterialTypography.h>
#include "base/strings/sys_string_conversions.h"
#include "remoting/base/string_resources.h"
#import "remoting/ios/app/host_collection_view_cell.h"
#import "remoting/ios/app/remoting_theme.h"
#import "remoting/ios/app/view_utils.h"
#import "remoting/ios/domain/host_info.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
static const CGFloat kLinePadding = 2.f;
static const CGFloat kHostCardIconInset = 10.f;
static const CGFloat kHostCardPadding = 4.f;

3
remoting/ios/app/host_collection_view_controller.h

@ -7,7 +7,8 @@
#import <UIKit/UIKit.h>
#import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
#import <MaterialComponents/MaterialCollections.h>
#import "remoting/ios/app/host_collection_view_cell.h"
#import "remoting/ios/domain/host_info.h"

22
remoting/ios/app/host_collection_view_controller.mm

@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "remoting/ios/app/host_collection_view_controller.h"
#import <MaterialComponents/MaterialCollections.h>
#import <MaterialComponents/MaterialInk.h>
#import <MaterialComponents/MaterialShadowElevations.h>
#import <MaterialComponents/MaterialShadowLayer.h>
#include "remoting/base/string_resources.h"
#import "remoting/ios/app/host_collection_header_view.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/host_collection_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/Ink/src/MaterialInk.h"
#import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
#import "ios/third_party/material_components_ios/src/components/ShadowElevations/src/MaterialShadowElevations.h"
#import "ios/third_party/material_components_ios/src/components/ShadowLayer/src/MaterialShadowLayer.h"
#import "remoting/ios/app/host_collection_header_view.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
static NSString* const kReusableIdentifierItem =
@"remotingHostCollectionViewControllerItem";

18
remoting/ios/app/host_fetching_error_view_controller.mm

@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "remoting/ios/app/host_fetching_error_view_controller.h"
#import <MaterialComponents/MDCTypography.h>
#import <MaterialComponents/MaterialButtons.h>
#include "remoting/base/string_resources.h"
#import "remoting/ios/app/remoting_theme.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/host_fetching_error_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MDCTypography.h"
#import "remoting/ios/app/remoting_theme.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
static const CGFloat kPadding = 20;
static const CGFloat kLineSpace = 30;

3
remoting/ios/app/host_fetching_view_controller.mm

@ -8,7 +8,8 @@
#import "remoting/ios/app/host_fetching_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MDCActivityIndicator.h"
#import <MaterialComponents/MDCActivityIndicator.h>
#import "remoting/ios/app/remoting_theme.h"
static const CGFloat kActivityIndicatorStrokeWidth = 2.5f;

20
remoting/ios/app/host_setup_footer_view.mm

@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "remoting/ios/app/host_setup_footer_view.h"
#import <MaterialComponents/MaterialButtons.h>
#import <MaterialComponents/MaterialTypography.h>
#import "remoting/ios/app/app_delegate.h"
#import "remoting/ios/app/remoting_theme.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/host_setup_footer_view.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import "remoting/ios/app/app_delegate.h"
#import "remoting/ios/app/remoting_theme.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
static const CGFloat kTopPadding = 6.f;
@implementation HostSetupFooterView

18
remoting/ios/app/host_setup_header_view.mm

@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "remoting/ios/app/host_setup_header_view.h"
#import <MaterialComponents/MaterialTypography.h>
#import "remoting/ios/app/remoting_theme.h"
#import "remoting/ios/app/view_utils.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
#import "remoting/ios/app/host_setup_header_view.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import "remoting/ios/app/remoting_theme.h"
#import "remoting/ios/app/view_utils.h"
#include "remoting/base/string_resources.h"
#include "ui/base/l10n/l10n_util.h"
static const CGFloat kSetupTitleInset = 22.f;
static const CGFloat kYPadding = 28.f;

Some files were not shown because too many files have changed in this diff Show More