| Index: ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm
|
| diff --git a/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm b/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm
|
| index b036348e4ffefe4dcfe9f3301991a4e4522029f3..645a9651e7c63e7355585bf13c83638e123f1d15 100644
|
| --- a/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm
|
| +++ b/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm
|
| @@ -17,6 +17,7 @@
|
| #include "base/logging.h"
|
| #include "base/mac/bundle_locations.h"
|
| #include "base/mac/foundation_util.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/metrics/user_metrics.h"
|
| #include "base/metrics/user_metrics_action.h"
|
| @@ -41,6 +42,7 @@
|
| #import "ios/chrome/browser/ui/history/tab_history_popup_controller.h"
|
| #import "ios/chrome/browser/ui/image_util.h"
|
| #import "ios/chrome/browser/ui/keyboard/hardware_keyboard_watcher.h"
|
| +#include "ios/chrome/browser/ui/omnibox/location_bar_controller_impl.h"
|
| #include "ios/chrome/browser/ui/omnibox/omnibox_view_ios.h"
|
| #import "ios/chrome/browser/ui/reversed_animation.h"
|
| #include "ios/chrome/browser/ui/rtl_geometry.h"
|
| @@ -58,6 +60,8 @@
|
| #import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
|
| #import "ios/public/provider/chrome/browser/images/branded_image_provider.h"
|
| #import "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
|
| +#include "ios/shared/chrome/browser/ui/omnibox/location_bar_controller.h"
|
| +#include "ios/shared/chrome/browser/ui/omnibox/location_bar_delegate.h"
|
| #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
|
| #import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
|
| #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
|
| @@ -256,7 +260,7 @@ CGRect RectShiftedDownAndResizedForStatusBar(CGRect rect) {
|
| base::scoped_nsobject<UIImageView> _incognitoIcon;
|
| base::scoped_nsobject<UIView> _clippingView;
|
|
|
| - std::unique_ptr<LocationBarViewIOS> _locationBar;
|
| + std::unique_ptr<LocationBarController> _locationBar;
|
| BOOL _initialLayoutComplete;
|
| // If |YES|, toolbar is incognito.
|
| BOOL _incognito;
|
| @@ -595,8 +599,8 @@ CGRect RectShiftedDownAndResizedForStatusBar(CGRect rect) {
|
| [_webToolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
|
| UIViewAutoresizingFlexibleBottomMargin];
|
| [_webToolbar setFrame:[self specificControlsArea]];
|
| - _locationBar.reset(
|
| - new LocationBarViewIOS(_omniBox, _browserState, preloader, self, self));
|
| + _locationBar = base::MakeUnique<LocationBarControllerImpl>(
|
| + _omniBox, _browserState, preloader, self, self);
|
|
|
| // Create the determinate progress bar (phone only).
|
| if (idiom == IPHONE_IDIOM) {
|
| @@ -1975,10 +1979,6 @@ CGRect RectShiftedDownAndResizedForStatusBar(CGRect rect) {
|
| [_keyboardVoiceSearchButton setHidden:YES];
|
| }
|
|
|
| -- (LocationBarViewIOS*)locationBar {
|
| - return _locationBar.get();
|
| -}
|
| -
|
| - (CGFloat)omniboxLeading {
|
| // Compute what the leading (x-origin) position for the omniboox should be
|
| // based on what other controls are active.
|
|
|