[ios] Adds a LocationBarController interface.

ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // 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/web_toolbar_controller.h"
 
 #import <CoreLocation/CoreLocation.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include <stdint.h>
@@ skipping 23 matching lines @@
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #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"
 #import "ios/chrome/browser/ui/toolbar/toolbar_controller+protected.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_model_ios.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/url_loader.h"
 #import "ios/chrome/browser/ui/voice/text_to_speech_player.h"
 #import "ios/chrome/browser/ui/voice/voice_search_notification_names.h"
 #import "ios/chrome/common/material_timing.h"
 #include "ios/chrome/grit/ios_strings.h"
 #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"
 #include "ios/web/public/referrer.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 #import "ui/gfx/ios/NSString+CrStringDrawing.h"
 
@@ skipping 178 matching lines @@
   base::scoped_nsobject<UIButton> _cancelButton;
   base::scoped_nsobject<UIView> _keyBoardAccessoryView;
   base::scoped_nsobject<UIButton> _keyboardVoiceSearchButton;
   // Progress bar used to show what fraction of the page has loaded.
   base::scoped_nsobject<MDCProgressView> _determinateProgressView;
   base::scoped_nsobject<UIImageView> _omniboxBackground;
   BOOL _prerenderAnimating;
   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;
 
   // If set to |YES|, disables animations that tests would otherwise trigger.
   BOOL _unitTesting;
 
   // If set to |YES|, text to speech is currently playing and the toolbar voice
   // icon should indicate so.
   BOOL _isTTSPlaying;
@@ skipping 318 matching lines @@
   SetA11yLabelAndUiAutomationName(_starButton, IDS_TOOLTIP_STAR, @"Bookmark");
   SetA11yLabelAndUiAutomationName(
       _voiceSearchButton, IDS_IOS_ACCNAME_VOICE_SEARCH, @"Voice Search");
   SetA11yLabelAndUiAutomationName(_omniBox, IDS_ACCNAME_LOCATION, @"Address");
 
   // Resize the container to match the available area.
   [self.view addSubview:_webToolbar];
   [_webToolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                                    UIViewAutoresizingFlexibleBottomMargin];
   [_webToolbar setFrame:[self specificControlsArea]];
-  _locationBar.reset(
-      new LocationBarViewIOS(_omniBox, _browserState, preloader, self, self));
+  _locationBar.reset(new LocationBarControllerImpl(_omniBox, _browserState,

[sdefresne, 2017/04/04 13:58:16]

nit: use base::MakeUnique if possible

  _locationBar = base::MakeUnique<...>(...);

[rohitrao (ping after 24h), 2017/04/04 14:32:29]

Done.

+                                                   preloader, self, self));
 
   // Create the determinate progress bar (phone only).
   if (idiom == IPHONE_IDIOM) {
     CGFloat progressWidth = self.view.frame.size.width;
     CGFloat progressHeight = 0;
     progressHeight = kMaterialProgressBarHeight;
     _determinateProgressView.reset([[MDCProgressView alloc] init]);
     _determinateProgressView.get().hidden = YES;
     [_determinateProgressView
         setProgressTintColor:[MDCPalette cr_bluePalette].tint500];
@@ skipping 1358 matching lines @@
       [[GenericChromeCommand alloc] initWithTag:IDC_PRELOAD_VOICE_SEARCH]);
   [sender chromeExecuteCommand:command];
 }
 
 // Called when the keyboard voice search button is tapped with voice search
 // disabled.  Hides the voice search button but takes no other action.
 - (void)ignoreVoiceSearch:(id)sender {
   [_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.
   InterfaceIdiom idiom = IsIPadIdiom() ? IPAD_IDIOM : IPHONE_IDIOM;
 
   CGFloat trailingPadding = 0.0;
 
   LayoutRect leadingControlLayout = LayoutRectForRectInBoundingRect(
       [_backButton frame], [_webToolbar bounds]);
   LayoutRect forwardButtonLayout =
@@ skipping 577 matching lines @@
 
 - (BOOL)isPrerenderAnimationRunning {
   return _prerenderAnimating;
 }
 
 - (OmniboxTextFieldIOS*)omnibox {
   return _omniBox.get();
 }
 
 @end