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

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

Issue 2650563002: Pass WebState to NativeAppNavigationController (Closed)
Patch Set: Add chrome_web_test support 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
« ios/chrome/browser/tabs/tab.h ('K') | « ios/chrome/browser/tabs/tab.h ('k') | no next file » | 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 2286 matching lines...) Expand 10 before | Expand all | Expand 10 after
2297 2297
2298 - (NativeAppNavigationController*)nativeAppNavigationController { 2298 - (NativeAppNavigationController*)nativeAppNavigationController {
2299 return nativeAppNavigationController_; 2299 return nativeAppNavigationController_;
2300 } 2300 }
2301 2301
2302 - (void)initNativeAppNavigationController { 2302 - (void)initNativeAppNavigationController {
2303 if (browserState_->IsOffTheRecord()) 2303 if (browserState_->IsOffTheRecord())
2304 return; 2304 return;
2305 DCHECK(!nativeAppNavigationController_); 2305 DCHECK(!nativeAppNavigationController_);
2306 nativeAppNavigationController_.reset([[NativeAppNavigationController alloc] 2306 nativeAppNavigationController_.reset([[NativeAppNavigationController alloc]
2307 initWithRequestContextGetter:browserState_->GetRequestContext() 2307 initWithWebState:self.webState
2308 tab:self]); 2308 requestContextGetter:browserState_->GetRequestContext()
2309 tab:self]);
2309 [self.webController addObserver:nativeAppNavigationController_]; 2310 [self.webController addObserver:nativeAppNavigationController_];
2310 DCHECK(nativeAppNavigationController_); 2311 DCHECK(nativeAppNavigationController_);
2311 } 2312 }
2312 2313
2313 - (id<PassKitDialogProvider>)passKitDialogProvider { 2314 - (id<PassKitDialogProvider>)passKitDialogProvider {
2314 return passKitDialogProvider_.get(); 2315 return passKitDialogProvider_.get();
2315 } 2316 }
2316 2317
2317 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider { 2318 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider {
2318 passKitDialogProvider_.reset(provider); 2319 passKitDialogProvider_.reset(provider);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
2375 2376
2376 - (TabModel*)parentTabModel { 2377 - (TabModel*)parentTabModel {
2377 return parentTabModel_; 2378 return parentTabModel_;
2378 } 2379 }
2379 2380
2380 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2381 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2381 return inputAccessoryViewController_.get(); 2382 return inputAccessoryViewController_.get();
2382 } 2383 }
2383 2384
2384 @end 2385 @end
OLDNEW
« ios/chrome/browser/tabs/tab.h ('K') | « ios/chrome/browser/tabs/tab.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698