[iOS] Move keyboard_assist folder to omnibox.

The keyboard accessory view is only needed by the omnibox.

Bug: 784819
Change-Id: Icbd24bf88c72a4b49233a32c68fe0ad03e30eb8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2166268Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763447}

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

@@ -62,10 +62,10 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
     "//ios/chrome/browser/ui/omnibox:omnibox_util",
+    "//ios/chrome/browser/ui/omnibox/keyboard_assist",
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/orchestrator:orchestrator",
     "//ios/chrome/browser/ui/toolbar/buttons",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist:keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_DELEGATE_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_DELEGATE_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_DELEGATE_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_DELEGATE_H_
 
 #import <UIKit/UIKit.h>
 
@@ -29,7 +29,7 @@
 // TODO(crbug.com/784819): Move this code to omnibox.
 // Implementation of the ToolbarAssistiveKeyboardDelegate.
 @interface ToolbarAssistiveKeyboardDelegateImpl
-    : NSObject<ToolbarAssistiveKeyboardDelegate>
+    : NSObject <ToolbarAssistiveKeyboardDelegate>
 
 @property(nonatomic, weak) id<ApplicationCommands, BrowserCommands> dispatcher;
 @property(nonatomic, weak) OmniboxTextFieldIOS* omniboxTextField;
@@ -37,4 +37,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_DELEGATE_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_DELEGATE_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views.h → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -22,4 +22,4 @@ void ConfigureAssistiveKeyboardViews(
     NSString* dotComTLD,
     id<ToolbarAssistiveKeyboardDelegate> delegate);
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views.mm

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views.h"
 
 #include "base/logging.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_input_assistant_items.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_keyboard_accessory_view.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_input_assistant_items.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_keyboard_accessory_view.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views_utils.h → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views_utils.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_UTILS_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_UTILS_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_UTILS_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_UTILS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -16,4 +16,4 @@ extern NSString* const kVoiceSearchInputAccessoryViewID;
 NSArray<UIButton*>* ToolbarAssistiveKeyboardLeadingButtons(
     id<ToolbarAssistiveKeyboardDelegate> delegate);
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_UTILS_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_ASSISTIVE_KEYBOARD_VIEWS_UTILS_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views_utils.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views_utils.mm

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
 
 #include "base/logging.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_accessory_button.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_accessory_button.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/voice/voice_search_availability.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_input_assistant_items.h → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_input_assistant_items.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_INPUT_ASSISTANT_ITEMS_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_INPUT_ASSISTANT_ITEMS_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_INPUT_ASSISTANT_ITEMS_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_INPUT_ASSISTANT_ITEMS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -18,4 +18,4 @@ NSArray<UIBarButtonItemGroup*>* ToolbarAssistiveKeyboardTrailingBarButtonGroups(
     id<ToolbarAssistiveKeyboardDelegate> delegate,
     NSArray<NSString*>* buttonTitles);
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_INPUT_ASSISTANT_ITEMS_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_INPUT_ASSISTANT_ITEMS_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_input_assistant_items.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_input_assistant_items.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_input_assistant_items.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_input_assistant_items.h"
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_ui_bar_button_item.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_bar_button_item.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_ui_bar_button_item.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_bar_button_item.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/voice/voice_search_availability.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_keyboard_accessory_view.h → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_keyboard_accessory_view.h

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_KEYBOARD_ACCESSORY_VIEW_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_KEYBOARD_ACCESSORY_VIEW_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_KEYBOARD_ACCESSORY_VIEW_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_KEYBOARD_ACCESSORY_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
 
 // Accessory View above the keyboard.
 // Shows keys that are shortcuts to commonly used characters or strings,
 // and buttons to start Voice Search or a Camera Search.
-@interface ToolbarKeyboardAccessoryView : UIInputView<UIInputViewAudioFeedback>
+@interface ToolbarKeyboardAccessoryView : UIInputView <UIInputViewAudioFeedback>
 
 // Designated initializer. |buttonTitles| lists the titles of the shortcut
 // buttons. |delegate| receives the various events triggered in the view. Not
@@ -28,4 +28,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_KEYBOARD_ACCESSORY_VIEW_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_KEYBOARD_ACCESSORY_VIEW_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_keyboard_accessory_view.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_keyboard_accessory_view.mm

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_keyboard_accessory_view.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_keyboard_accessory_view.h"
 
 #include "base/mac/foundation_util.h"
 #include "ios/chrome/browser/system_flags.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
 #include "ios/chrome/browser/ui/util/rtl_geometry.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
@@ -36,8 +36,8 @@
 
 - (instancetype)initWithButtons:(NSArray<NSString*>*)buttonTitles
                        delegate:(id<ToolbarAssistiveKeyboardDelegate>)delegate {
-  self =
-      [super initWithFrame:CGRectZero inputViewStyle:UIInputViewStyleKeyboard];
+  self = [super initWithFrame:CGRectZero
+               inputViewStyle:UIInputViewStyleKeyboard];
   if (self) {
     _buttonTitles = buttonTitles;
     _delegate = delegate;

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_ui_bar_button_item.h → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_ui_bar_button_item.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_UI_BAR_BUTTON_ITEM_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_UI_BAR_BUTTON_ITEM_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_UI_BAR_BUTTON_ITEM_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_UI_BAR_BUTTON_ITEM_H_
 
 #import <UIKit/UIKit.h>
 
@@ -19,4 +19,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_TOOLBAR_UI_BAR_BUTTON_ITEM_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_TOOLBAR_UI_BAR_BUTTON_ITEM_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_ui_bar_button_item.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_ui_bar_button_item.mm

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_ui_bar_button_item.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_ui_bar_button_item.h"
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_accessory_button.h → ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_accessory_button.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_ACCESSORY_BUTTON_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_ACCESSORY_BUTTON_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_ACCESSORY_BUTTON_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_ACCESSORY_BUTTON_H_
 
 #import <UIKit/UIKit.h>
 #include <memory>
@@ -21,4 +21,4 @@ class VoiceSearchAvailability;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_ACCESSORY_BUTTON_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_ACCESSORY_BUTTON_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_accessory_button.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_accessory_button.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_accessory_button.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_accessory_button.h"
 
 #include "base/logging.h"
 #import "ios/chrome/browser/voice/voice_search_availability.h"

ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_accessory_button_unittest.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_accessory_button_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_accessory_button.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_accessory_button.h"
 
 #import "ios/chrome/browser/voice/fake_voice_search_availability.h"
 #include "testing/platform_test.h"

ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_bar_button_item.h → ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_bar_button_item.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_BAR_BUTTON_ITEM_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_BAR_BUTTON_ITEM_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_BAR_BUTTON_ITEM_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_BAR_BUTTON_ITEM_H_
 
 #import <UIKit/UIKit.h>
 #include <memory>
@@ -28,4 +28,4 @@ class VoiceSearchAvailability;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_BAR_BUTTON_ITEM_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_KEYBOARD_ASSIST_VOICE_SEARCH_KEYBOARD_BAR_BUTTON_ITEM_H_

ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_bar_button_item.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_bar_button_item.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_bar_button_item.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_bar_button_item.h"
 
 #import "ios/chrome/browser/voice/voice_search_availability.h"
 

ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_bar_button_item_unittest.mm → ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_bar_button_item_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/voice_search_keyboard_bar_button_item.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/voice_search_keyboard_bar_button_item.h"
 
 #import "ios/chrome/browser/voice/fake_voice_search_availability.h"
 #include "testing/platform_test.h"

ios/chrome/browser/ui/omnibox/omnibox_coordinator.mm

@@ -19,6 +19,8 @@
 #import "ios/chrome/browser/ui/commands/load_query_commands.h"
 #import "ios/chrome/browser/ui/commands/omnibox_commands.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_constants.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_mediator.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_util.h"
@@ -26,8 +28,6 @@
 #include "ios/chrome/browser/ui/omnibox/omnibox_view_ios.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_coordinator.h"
 #include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_delegate.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

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

@@ -53,7 +53,6 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/orchestrator",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/toolbar/buttons",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",

ios/chrome/test/BUILD.gn

@@ -272,6 +272,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/ntp:unit_tests",
     "//ios/chrome/browser/ui/ntp_tile_views:unit_tests",
     "//ios/chrome/browser/ui/omnibox:unit_tests",
+    "//ios/chrome/browser/ui/omnibox/keyboard_assist:unit_tests",
     "//ios/chrome/browser/ui/omnibox/popup:unit_tests",
     "//ios/chrome/browser/ui/open_in:unit_tests",
     "//ios/chrome/browser/ui/overlays:unit_tests",
@@ -306,7 +307,6 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/tabs:unit_tests",
     "//ios/chrome/browser/ui/toolbar:unit_tests",
     "//ios/chrome/browser/ui/toolbar/fullscreen:unit_tests",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist:unit_tests",
     "//ios/chrome/browser/ui/toolbar_container:unit_tests",
     "//ios/chrome/browser/ui/translate:unit_tests",
     "//ios/chrome/browser/ui/util:unit_tests",

ios/chrome/test/earl_grey/BUILD.gn

@@ -283,6 +283,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/history:history_ui",
     "//ios/chrome/browser/ui/location_bar:location_bar",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox/keyboard_assist",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/qr_scanner:test_support",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
@@ -310,7 +311,6 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/toolbar:test_support",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
@@ -442,6 +442,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/omnibox:app_support+eg2",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox/keyboard_assist",
     "//ios/chrome/browser/ui/passwords:app_support+eg2",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/qr_scanner:eg_app_support+eg2",
@@ -474,7 +475,6 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/toolbar:eg_app_support+eg2",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:eg_app_support+eg2",

ios/chrome/test/earl_grey/chrome_matchers_app_interface.mm

@@ -26,6 +26,7 @@
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/history/history_ui_constants.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_steady_view.h"
+#import "ios/chrome/browser/ui/omnibox/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_constants.h"
@@ -49,7 +50,6 @@
 #import "ios/chrome/browser/ui/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/browser/ui/tab_grid/tab_grid_constants.h"
 #import "ios/chrome/browser/ui/table_view/cells/table_view_url_item.h"
-#import "ios/chrome/browser/ui/toolbar/keyboard_assist/toolbar_assistive_keyboard_views_utils.h"
 #import "ios/chrome/browser/ui/toolbar/primary_toolbar_view.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_constants.h"
 #import "ios/chrome/browser/ui/util/ui_util.h"

ios/showcase/core/BUILD.gn

@@ -30,8 +30,8 @@ source_set("main_eg2") {
   deps = [
     ":core",
     "//base",
+    "//ios/chrome/browser/ui/omnibox/keyboard_assist",
     "//ios/chrome/browser/ui/settings",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
 
     # Needed to disable the tests hooks.
     "//ios/chrome/test/earl_grey:hooks",
@@ -48,11 +48,11 @@ source_set("main") {
   deps = [
     ":core",
     "//base",
-    "//ios/chrome/browser/ui/settings",
-    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
 
     # Needed to disable the tests hooks.
     "//ios/chrome/app:tests_fake_hook",
+    "//ios/chrome/browser/ui/omnibox/keyboard_assist",
+    "//ios/chrome/browser/ui/settings",
 
     # Needed for including ios/chrome/browser/ui.
     "//ios/chrome/browser/tabs:tabs_internal",