Skip to content

Commit 43090ba

Browse files
sdefresneChromium LUCI CQ
authored andcommitted
[ios] Move headers out of //ios/public/provider/chrome/browser
The voice_search_language.*, logo_animation_controller.h, logo_vendor.h and voice_search_prefs.* files are not part of the provider API but of //ios/chrome/browser, so move the file there. Leave forwarding header/target to not break internal repository. Bug: 1201182 Change-Id: I9a1e8669f5bb5f7a2abedcb9f37c4cdf1e6b0047 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3132967 Commit-Queue: Sylvain Defresne <[email protected]> Commit-Queue: David Jean <[email protected]> Auto-Submit: Sylvain Defresne <[email protected]> Reviewed-by: David Jean <[email protected]> Cr-Commit-Position: refs/heads/main@{#916811}
1 parent 2092d7f commit 43090ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+249
-170
lines changed

ios/chrome/browser/browser_state/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ source_set("test_support") {
220220
"//ios/chrome/browser/prefs",
221221
"//ios/chrome/browser/prefs:browser_prefs",
222222
"//ios/chrome/browser/sync/glue",
223+
"//ios/chrome/browser/ui/ntp:logo",
223224
"//ios/chrome/browser/undo",
224225
"//ios/chrome/browser/webdata_services",
225226
"//ios/chrome/test:test_support",
226227
"//ios/public/provider/chrome/browser",
227-
"//ios/public/provider/chrome/browser/ui",
228228
"//ios/web",
229229
"//net:test_support",
230230
]

ios/chrome/browser/passwords/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ source_set("passwords") {
8787
"//ios/chrome/browser/ui/elements:selector_coordinator",
8888
"//ios/chrome/browser/ui/infobars:feature_flags",
8989
"//ios/chrome/browser/ui/infobars/coordinators",
90+
"//ios/chrome/browser/ui/ntp:logo",
9091
"//ios/chrome/browser/ui/util",
9192
"//ios/chrome/browser/web",
9293
"//ios/chrome/browser/webdata_services",
9394
"//ios/chrome/common/ui/util",
9495
"//ios/public/provider/chrome/browser",
95-
"//ios/public/provider/chrome/browser/ui",
9696
"//ios/third_party/material_components_ios",
9797
"//ios/web/common",
9898
"//ios/web/public/js_messaging",

ios/chrome/browser/providers/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ source_set("providers") {
1515
]
1616
deps = [
1717
"//base",
18+
"//ios/chrome/browser/ui/ntp:logo",
19+
"//ios/chrome/browser/voice:voice_search_language",
1820
"//ios/chrome/browser/web:feature_flags",
1921
"//ios/public/provider/chrome/browser",
2022
"//ios/public/provider/chrome/browser:font_size_java_script_feature",
2123
"//ios/public/provider/chrome/browser/discover_feed",
2224
"//ios/public/provider/chrome/browser/signin",
23-
"//ios/public/provider/chrome/browser/ui",
2425
"//ios/public/provider/chrome/browser/user_feedback",
2526
"//ios/public/provider/chrome/browser/voice",
2627
"//ui/base",

ios/chrome/browser/providers/chromium_logo_controller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#import <Foundation/Foundation.h>
99

10-
#import "ios/public/provider/chrome/browser/ui/logo_vendor.h"
10+
#import "ios/chrome/browser/ui/ntp/logo_vendor.h"
1111

1212
@interface ChromiumLogoController : NSObject<LogoVendor>
1313
@end

ios/chrome/browser/providers/chromium_voice_search_provider.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#import "ios/chrome/browser/providers/chromium_voice_search_provider.h"
66

7-
#import "ios/public/provider/chrome/browser/voice/voice_search_language.h"
7+
#import "ios/chrome/browser/voice/voice_search_language.h"
88

99
#if !defined(__has_feature) || !__has_feature(objc_arc)
1010
#error "This file requires ARC support."

ios/chrome/browser/ui/autofill/cells/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ source_set("cells") {
2929
"//ios/chrome/browser/ui/autofill:autofill_ui_type",
3030
"//ios/chrome/browser/ui/collection_view/cells",
3131
"//ios/chrome/browser/ui/colors",
32+
"//ios/chrome/browser/ui/ntp:logo",
3233
"//ios/chrome/browser/ui/table_view:styler",
3334
"//ios/chrome/browser/ui/table_view/cells",
3435
"//ios/chrome/browser/ui/table_view/cells:cells_constants",
3536
"//ios/chrome/browser/ui/util",
3637
"//ios/chrome/common/ui/colors",
3738
"//ios/chrome/common/ui/util",
3839
"//ios/public/provider/chrome/browser",
39-
"//ios/public/provider/chrome/browser/ui",
4040
"//ios/third_party/material_components_ios",
4141
"//ui/base",
4242
]

ios/chrome/browser/ui/bookmarks/cells/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ source_set("cells") {
2828
"//ios/chrome/browser/ui/bookmarks:core",
2929
"//ios/chrome/browser/ui/colors",
3030
"//ios/chrome/browser/ui/icons",
31+
"//ios/chrome/browser/ui/ntp:logo",
3132
"//ios/chrome/browser/ui/table_view:styler",
3233
"//ios/chrome/browser/ui/table_view/cells",
3334
"//ios/chrome/common/ui/util",
3435
"//ios/public/provider/chrome/browser",
35-
"//ios/public/provider/chrome/browser/ui",
3636
"//ios/third_party/material_components_ios",
3737
"//ui/base",
3838
]

ios/chrome/browser/ui/browser_view/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ source_set("browser_view") {
128128
"//ios/chrome/browser/ui/menu",
129129
"//ios/chrome/browser/ui/ntp",
130130
"//ios/chrome/browser/ui/ntp:coordinator",
131+
"//ios/chrome/browser/ui/ntp:logo",
131132
"//ios/chrome/browser/ui/ntp:util",
132133
"//ios/chrome/browser/ui/omnibox:omnibox_internal",
133134
"//ios/chrome/browser/ui/omnibox/popup",
@@ -196,7 +197,6 @@ source_set("browser_view") {
196197
"//ios/components/webui:url_constants",
197198
"//ios/public/provider/chrome/browser",
198199
"//ios/public/provider/chrome/browser/text_zoom:text_zoom_api",
199-
"//ios/public/provider/chrome/browser/ui",
200200
"//ios/public/provider/chrome/browser/voice",
201201
"//ios/third_party/material_components_ios",
202202
"//ios/third_party/webkit",

ios/chrome/browser/ui/browser_view/browser_view_controller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#import "ios/chrome/browser/ui/find_bar/find_bar_coordinator.h"
1212
#import "ios/chrome/browser/ui/gestures/view_revealing_vertical_pan_handler.h"
1313
#import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_consumer.h"
14+
#import "ios/chrome/browser/ui/ntp/logo_animation_controller.h"
1415
#import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
1516
#import "ios/chrome/browser/ui/settings/sync/utils/sync_presenter.h"
1617
#import "ios/chrome/browser/ui/thumb_strip/thumb_strip_supporting.h"
1718
#import "ios/chrome/browser/ui/toolbar/toolbar_coordinator_delegate.h"
1819
#import "ios/chrome/browser/web/web_navigation_ntp_delegate.h"
19-
#import "ios/public/provider/chrome/browser/voice/logo_animation_controller.h"
2020

2121
@protocol ActivityServicePositioner;
2222
class Browser;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
#import "ios/chrome/browser/ui/bubble/bubble_presenter_delegate.h"
8484
#import "ios/chrome/browser/ui/commands/command_dispatcher.h"
8585
#import "ios/chrome/browser/ui/commands/help_commands.h"
86+
#import "ios/chrome/browser/ui/commands/load_query_commands.h"
8687
#import "ios/chrome/browser/ui/commands/reading_list_add_command.h"
8788
#import "ios/chrome/browser/ui/commands/show_signin_command.h"
8889
#import "ios/chrome/browser/ui/commands/text_zoom_commands.h"
@@ -2005,7 +2006,7 @@ - (void)buildToolbarAndTabStrip {
20052006
[self updateBroadcastState];
20062007
if (_voiceSearchController)
20072008
_voiceSearchController->SetDispatcher(
2008-
static_cast<id<LoadQueryCommands>>(self.commandDispatcher));
2009+
HandlerForProtocol(self.commandDispatcher, LoadQueryCommands));
20092010

20102011
if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
20112012
if (base::FeatureList::IsEnabled(kModernTabStrip)) {

0 commit comments

Comments
 (0)