[iOS] Add experimental new keyboard accessory view.

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 11 matching lines @@
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/search_engines/util.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/toolbar/toolbar_model.h"
 #include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
+#include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #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/popup_menu/popup_menu_view.h"
 #import "ios/chrome/browser/ui/reversed_animation.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #import "ios/chrome/browser/ui/toolbar/keyboard_accessory_view.h"
+#import "ios/chrome/browser/ui/toolbar/keyboard_accessory_view_protocol.h"
+#import "ios/chrome/browser/ui/toolbar/new_keyboard_accessory_view.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"
@@ skipping 175 matching lines @@
   // Top-level view for web content.
   UIView* _webToolbar;
   UIButton* _backButton;
   UIButton* _forwardButton;
   UIButton* _reloadButton;
   UIButton* _stopButton;
   UIButton* _starButton;
   UIButton* _voiceSearchButton;
   OmniboxTextFieldIOS* _omniBox;
   UIButton* _cancelButton;
-  KeyboardAccessoryView* _keyBoardAccessoryView;
+  UIView<KeyboardAccessoryViewProtocol>* _keyboardAccessoryView;
   // Progress bar used to show what fraction of the page has loaded.
   MDCProgressView* _determinateProgressView;
   UIImageView* _omniboxBackground;
   BOOL _prerenderAnimating;
   UIImageView* _incognitoIcon;
   UIView* _clippingView;
 
   std::unique_ptr<LocationBarController> _locationBar;
   BOOL _initialLayoutComplete;
   // If |YES|, toolbar is incognito.
@@ skipping 612 matching lines @@
   if (IsIPadIdiom()) {
     // Update toolbar accessory views.
     BOOL isCompactTabletView = IsCompactTablet(self.view);
     [_voiceSearchButton setHidden:isCompactTabletView];
     [_starButton setHidden:isCompactTabletView];
     [_reloadButton setHidden:isCompactTabletView];
     [_stopButton setHidden:isCompactTabletView];
     [self updateToolbarState];
 
     // Update keyboard accessory views.
-    auto mode = _keyBoardAccessoryView.mode;
-    _keyBoardAccessoryView = nil;
+    auto mode = _keyboardAccessoryView.mode;
+    _keyboardAccessoryView = nil;
     [_omniBox setInputAccessoryView:[self keyboardAccessoryView]];
-    _keyBoardAccessoryView.mode = mode;
+    _keyboardAccessoryView.mode = mode;
     if ([_omniBox isFirstResponder]) {
       [_omniBox reloadInputViews];
     }
 
     // Re-layout toolbar and omnibox.
     [_webToolbar setFrame:[self specificControlsArea]];
     [self layoutOmnibox];
   }
 }
 
@@ skipping 362 matching lines @@
           kLocationAuthorizationStatusCount);
     }
   }
   [self cancelOmniboxEdit];
 }
 
 - (void)locationBarHasBecomeFirstResponder {
   [self.delegate locationBarDidBecomeFirstResponder:self];
   [self animateMaterialOmnibox];
 
-  _keyBoardAccessoryView.mode = VOICE_SEARCH;
+  _keyboardAccessoryView.mode = VOICE_SEARCH;
 
   // Record the appropriate user action for focusing the omnibox.
   web::WebState* webState = [self.delegate currentWebState];
   if (webState) {
     if (webState->GetVisibleURL() == GURL(kChromeUINewTabURL)) {
       OmniboxEditModel* model = _locationBar->GetLocationEntry()->model();
       if (model->is_caret_visible()) {
         base::RecordAction(
             base::UserMetricsAction("MobileFocusedOmniboxOnNtp"));
       } else {
@@ skipping 17 matching lines @@
 }
 
 - (void)locationBarChanged {
   // Hide the voice search button once the user starts editing the omnibox but
   // show it if the omnibox is empty.
   bool isEditingOrEmpty = _locationBar->GetLocationEntry()->IsEditingOrEmpty();
   BOOL editingAndNotEmpty = isEditingOrEmpty && _omniBox.text.length != 0;
   // If the voice search button is visible but about to be hidden (i.e.
   // the omnibox is no longer empty) then this is the first omnibox text so
   // record a user action.
-  if (_keyBoardAccessoryView.mode == VOICE_SEARCH && editingAndNotEmpty) {
+  if (_keyboardAccessoryView.mode == VOICE_SEARCH && editingAndNotEmpty) {
     base::RecordAction(UserMetricsAction("MobileFirstTextInOmnibox"));
   }
   if (editingAndNotEmpty) {
-    _keyBoardAccessoryView.mode = KEY_SHORTCUTS;
+    _keyboardAccessoryView.mode = KEY_SHORTCUTS;
   } else {
-    _keyBoardAccessoryView.mode = VOICE_SEARCH;
+    _keyboardAccessoryView.mode = VOICE_SEARCH;
   }
 }
 
 - (web::WebState*)getWebState {
   return [self.delegate currentWebState];
 }
 
 - (ToolbarModel*)toolbarModel {
   ToolbarModelIOS* toolbarModelIOS = [self.delegate toolbarModelIOS];
   return toolbarModelIOS ? toolbarModelIOS->GetToolbarModel() : nullptr;
@@ skipping 138 matching lines @@
   }
 }
 
 #pragma mark -
 #pragma mark KeyboardAccessoryViewDelegate
 
 - (void)keyboardAccessoryVoiceSearchTouchDown {
   if (ios::GetChromeBrowserProvider()
           ->GetVoiceSearchProvider()
           ->IsVoiceSearchEnabled()) {
-    [self preloadVoiceSearch:_keyBoardAccessoryView];
+    [self preloadVoiceSearch:_keyboardAccessoryView];
   }
 }
 
 - (void)keyboardAccessoryVoiceSearchTouchUpInside {
   if (ios::GetChromeBrowserProvider()
           ->GetVoiceSearchProvider()
           ->IsVoiceSearchEnabled()) {
     base::RecordAction(UserMetricsAction("MobileCustomRowVoiceSearch"));
     GenericChromeCommand* command =
         [[GenericChromeCommand alloc] initWithTag:IDC_VOICE_SEARCH];
-    [_keyBoardAccessoryView chromeExecuteCommand:command];
+    [_keyboardAccessoryView chromeExecuteCommand:command];
   } else {
-    _keyBoardAccessoryView.mode = KEY_SHORTCUTS;
+    _keyboardAccessoryView.mode = KEY_SHORTCUTS;
   }
 }
 
+- (void)keyboardAccessoryCameraSearchTouchUpInside {
+  GenericChromeCommand* command =
+      [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_QR_SCANNER];
+  [_keyboardAccessoryView chromeExecuteCommand:command];
+}
+
 - (void)keyPressed:(NSString*)title {
   NSString* text = [self updateTextForDotCom:title];
   [_omniBox insertTextWhileEditing:text];
 }
 
 #pragma mark -
 #pragma mark Private methods.
 
 - (UIButton*)cancelButton {
   if (_cancelButton)
@@ skipping 341 matching lines @@
     ui::PageTransition transition = ui::PageTransitionFromInt(
         ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
     [self.urlLoader loadURL:GURL(searchURL)
                    referrer:web::Referrer()
                  transition:transition
           rendererInitiated:NO];
   }
 }
 
 - (UIView*)keyboardAccessoryView {
-  if (!_keyBoardAccessoryView) {
-    NSArray<NSString*>* buttonTitles =
-        [NSArray arrayWithObjects:@":", @".", @"-", @"/", kDotComTLD, nil];
-    _keyBoardAccessoryView =
-        [[KeyboardAccessoryView alloc] initWithButtons:buttonTitles
-                                              delegate:self];
-    [_keyBoardAccessoryView
+  if (!_keyboardAccessoryView) {
+    if (experimental_flags::IsKeyboardAccessoryViewWithCameraSearchEnabled()) {
+      // The '.' shortcut is left out because the new keyboard accessory view
+      // has less free space for the shortcut buttons, and the '.' is already
+      // present in the standard iOS keyboard.
+      NSArray<NSString*>* buttonTitles =
+          [NSArray arrayWithObjects:@":", @"-", @"/", kDotComTLD, nil];

[marq (ping after 24h), 2017/06/12 17:34:36]

Just use @[ ... ] instead of the nil-terminated -arrayWithObjects.

(here and below)

[jif, 2017/06/12 18:26:01]

Done.

+      _keyboardAccessoryView =
+          [[KeyboardAccessoryView alloc] initWithButtons:buttonTitles
+                                                delegate:self];
+    } else {
+      NSArray<NSString*>* buttonTitles =
+          [NSArray arrayWithObjects:@":", @".", @"-", @"/", kDotComTLD, nil];
+      _keyboardAccessoryView =
+          [[NewKeyboardAccessoryView alloc] initWithButtons:buttonTitles
+                                                   delegate:self];
+    }
+    [_keyboardAccessoryView
         setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
     _hardwareKeyboardWatcher = [[HardwareKeyboardWatcher alloc]
-        initWithAccessoryView:_keyBoardAccessoryView];
+        initWithAccessoryView:_keyboardAccessoryView];
   }
-  return _keyBoardAccessoryView;
+  return _keyboardAccessoryView;
 }
 
 - (void)preloadVoiceSearch:(id)sender {
   DCHECK(ios::GetChromeBrowserProvider()
              ->GetVoiceSearchProvider()
              ->IsVoiceSearchEnabled());
   // Use a GenericChromeCommand because |sender| already has a tag set for a
   // different command.
   GenericChromeCommand* command =
       [[GenericChromeCommand alloc] initWithTag:IDC_PRELOAD_VOICE_SEARCH];
@@ skipping 583 matching lines @@
 
 - (BOOL)isPrerenderAnimationRunning {
   return _prerenderAnimating;
 }
 
 - (OmniboxTextFieldIOS*)omnibox {
   return _omniBox;
 }
 
 @end