| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h" | 5 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h" |
| 6 | 6 |
| 7 #import <CoreLocation/CoreLocation.h> | 7 #import <CoreLocation/CoreLocation.h> |
| 8 #include <QuartzCore/QuartzCore.h> | 8 #include <QuartzCore/QuartzCore.h> |
| 9 | 9 |
| 10 #include <stdint.h> | 10 #include <stdint.h> |
| (...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1312 base::RecordAction(UserMetricsAction("MobileFirstTextInOmnibox")); | 1312 base::RecordAction(UserMetricsAction("MobileFirstTextInOmnibox")); |
| 1313 } | 1313 } |
| 1314 [_keyboardVoiceSearchButton setHidden:editingAndNotEmpty]; | 1314 [_keyboardVoiceSearchButton setHidden:editingAndNotEmpty]; |
| 1315 } | 1315 } |
| 1316 | 1316 |
| 1317 - (web::WebState*)getWebState { | 1317 - (web::WebState*)getWebState { |
| 1318 return [self.delegate currentWebState]; | 1318 return [self.delegate currentWebState]; |
| 1319 } | 1319 } |
| 1320 | 1320 |
| 1321 - (ToolbarModel*)toolbarModel { | 1321 - (ToolbarModel*)toolbarModel { |
| 1322 ToolbarModelIOS* toolbarModelIOS = [self.delegate toolbarModelIOS]; | 1322 return [self.delegate toolbarModelIOS]; |
| 1323 return toolbarModelIOS ? toolbarModelIOS->GetToolbarModel() : nullptr; | |
| 1324 } | 1323 } |
| 1325 | 1324 |
| 1326 #pragma mark - | 1325 #pragma mark - |
| 1327 #pragma mark OmniboxFocuser methods. | 1326 #pragma mark OmniboxFocuser methods. |
| 1328 | 1327 |
| 1329 - (void)focusOmnibox { | 1328 - (void)focusOmnibox { |
| 1330 if (![_webToolbar isHidden]) | 1329 if (![_webToolbar isHidden]) |
| 1331 [_omniBox becomeFirstResponder]; | 1330 [_omniBox becomeFirstResponder]; |
| 1332 } | 1331 } |
| 1333 | 1332 |
| (...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2564 | 2563 |
| 2565 - (BOOL)isPrerenderAnimationRunning { | 2564 - (BOOL)isPrerenderAnimationRunning { |
| 2566 return _prerenderAnimating; | 2565 return _prerenderAnimating; |
| 2567 } | 2566 } |
| 2568 | 2567 |
| 2569 - (OmniboxTextFieldIOS*)omnibox { | 2568 - (OmniboxTextFieldIOS*)omnibox { |
| 2570 return _omniBox.get(); | 2569 return _omniBox.get(); |
| 2571 } | 2570 } |
| 2572 | 2571 |
| 2573 @end | 2572 @end |
| OLD | NEW |