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

Side by Side Diff: ios/chrome/browser/tabs/tab.mm

Issue 2611673002: Moves overscroll code out of the ios_internal namespace. (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/ui/browser_view_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/tabs/tab.h" 5 #import "ios/chrome/browser/tabs/tab.h"
6 6
7 #import <CoreLocation/CoreLocation.h> 7 #import <CoreLocation/CoreLocation.h>
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 return; 1008 return;
1009 1009
1010 // Lazily create a OverscrollActionsController. 1010 // Lazily create a OverscrollActionsController.
1011 // The check for overscrollActionsControllerDelegate is necessary to avoid 1011 // The check for overscrollActionsControllerDelegate is necessary to avoid
1012 // recreating a OverscrollActionsController during teardown. 1012 // recreating a OverscrollActionsController during teardown.
1013 if (!overscrollActionsController_) { 1013 if (!overscrollActionsController_) {
1014 overscrollActionsController_.reset( 1014 overscrollActionsController_.reset(
1015 [[OverscrollActionsController alloc] init]); 1015 [[OverscrollActionsController alloc] init]);
1016 [self.webController addObserver:overscrollActionsController_]; 1016 [self.webController addObserver:overscrollActionsController_];
1017 } 1017 }
1018 ios_internal::OverscrollStyle style = 1018 OverscrollStyle style = OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO;
1019 ios_internal::OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO;
1020 if (browserState_->IsOffTheRecord()) { 1019 if (browserState_->IsOffTheRecord()) {
1021 style = ios_internal::OverscrollStyle::REGULAR_PAGE_INCOGNITO; 1020 style = OverscrollStyle::REGULAR_PAGE_INCOGNITO;
1022 } 1021 }
1023 [overscrollActionsController_ setStyle:style]; 1022 [overscrollActionsController_ setStyle:style];
1024 [overscrollActionsController_ 1023 [overscrollActionsController_
1025 setDelegate:overscrollActionsControllerDelegate]; 1024 setDelegate:overscrollActionsControllerDelegate];
1026 overscrollActionsControllerDelegate_.reset( 1025 overscrollActionsControllerDelegate_.reset(
1027 overscrollActionsControllerDelegate); 1026 overscrollActionsControllerDelegate);
1028 } 1027 }
1029 1028
1030 - (void)updateTitle:(NSString*)title { 1029 - (void)updateTitle:(NSString*)title {
1031 web::NavigationItem* item = [self navigationManager]->GetVisibleItem(); 1030 web::NavigationItem* item = [self navigationManager]->GetVisibleItem();
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
2452 2451
2453 - (TabModel*)parentTabModel { 2452 - (TabModel*)parentTabModel {
2454 return parentTabModel_; 2453 return parentTabModel_;
2455 } 2454 }
2456 2455
2457 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2456 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2458 return inputAccessoryViewController_.get(); 2457 return inputAccessoryViewController_.get();
2459 } 2458 }
2460 2459
2461 @end 2460 @end
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/browser/ui/browser_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698