Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Unified Diff: ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm

Issue 2934463002: [iOS] Add experimental new keyboard accessory view. (Closed)
Patch Set: Addressed comments. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ba6ae8de275f17080ee428288b0bbbeba5c91462..ec752cf917bb840bca496a803276e38ab89ab92c 100644
--- a/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm
+++ b/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm
@@ -29,6 +29,7 @@
#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"
@@ -1481,6 +1482,12 @@ - (void)keyboardAccessoryVoiceSearchTouchUpInside {
}
}
+- (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];
@@ -1843,8 +1850,17 @@ - (void)loadURLForQuery:(NSString*)query {
- (UIView*)keyboardAccessoryView {
if (!_keyBoardAccessoryView) {
- NSArray<NSString*>* buttonTitles =
- [NSArray arrayWithObjects:@":", @".", @"-", @"/", kDotComTLD, nil];
+ NSArray<NSString*>* buttonTitles;
+ 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.
+ buttonTitles =
+ [NSArray arrayWithObjects:@":", @"-", @"/", kDotComTLD, nil];
+ } else {
+ buttonTitles =
+ [NSArray arrayWithObjects:@":", @".", @"-", @"/", kDotComTLD, nil];
+ }
_keyBoardAccessoryView =
[[KeyboardAccessoryView alloc] initWithButtons:buttonTitles
delegate:self];

Powered by Google App Engine
This is Rietveld 408576698