| 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/browser_view_controller.h" | 5 #import "ios/chrome/browser/ui/browser_view_controller.h" |
| 6 | 6 |
| 7 #import <AssetsLibrary/AssetsLibrary.h> | 7 #import <AssetsLibrary/AssetsLibrary.h> |
| 8 #import <MobileCoreServices/MobileCoreServices.h> | 8 #import <MobileCoreServices/MobileCoreServices.h> |
| 9 #import <PassKit/PassKit.h> | 9 #import <PassKit/PassKit.h> |
| 10 #import <Photos/Photos.h> | 10 #import <Photos/Photos.h> |
| (...skipping 2732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2743 return _voiceSearchBar; | 2743 return _voiceSearchBar; |
| 2744 } | 2744 } |
| 2745 | 2745 |
| 2746 #pragma mark - Install OverScrollActionController method. | 2746 #pragma mark - Install OverScrollActionController method. |
| 2747 - (void)setOverScrollActionControllerToStaticNativeContent: | 2747 - (void)setOverScrollActionControllerToStaticNativeContent: |
| 2748 (StaticHtmlNativeContent*)nativeContent { | 2748 (StaticHtmlNativeContent*)nativeContent { |
| 2749 if (!IsIPadIdiom() && !FirstRun::IsChromeFirstRun()) { | 2749 if (!IsIPadIdiom() && !FirstRun::IsChromeFirstRun()) { |
| 2750 OverscrollActionsController* controller = | 2750 OverscrollActionsController* controller = |
| 2751 [[[OverscrollActionsController alloc] | 2751 [[[OverscrollActionsController alloc] |
| 2752 initWithScrollView:[nativeContent scrollView]] autorelease]; | 2752 initWithScrollView:[nativeContent scrollView]] autorelease]; |
| 2753 [[nativeContent scrollView] setDelegate:controller]; | |
| 2754 [controller setDelegate:self]; | 2753 [controller setDelegate:self]; |
| 2755 OverscrollStyle style = _isOffTheRecord | 2754 OverscrollStyle style = _isOffTheRecord |
| 2756 ? OverscrollStyle::REGULAR_PAGE_INCOGNITO | 2755 ? OverscrollStyle::REGULAR_PAGE_INCOGNITO |
| 2757 : OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO; | 2756 : OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO; |
| 2758 controller.style = style; | 2757 controller.style = style; |
| 2759 nativeContent.overscrollActionsController = controller; | 2758 nativeContent.overscrollActionsController = controller; |
| 2760 } | 2759 } |
| 2761 } | 2760 } |
| 2762 | 2761 |
| 2763 #pragma mark - OverscrollActionsControllerDelegate methods. | 2762 #pragma mark - OverscrollActionsControllerDelegate methods. |
| (...skipping 2333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5097 | 5096 |
| 5098 - (UIView*)voiceSearchButton { | 5097 - (UIView*)voiceSearchButton { |
| 5099 return _voiceSearchButton; | 5098 return _voiceSearchButton; |
| 5100 } | 5099 } |
| 5101 | 5100 |
| 5102 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5101 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5103 return [self currentLogoAnimationControllerOwner]; | 5102 return [self currentLogoAnimationControllerOwner]; |
| 5104 } | 5103 } |
| 5105 | 5104 |
| 5106 @end | 5105 @end |
| OLD | NEW |