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

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

Issue 2731443003: Removed CRWWebController dependency from NativeAppNavigationController. (Closed)
Patch Set: Added missing import Created 3 years, 9 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 | « ios/chrome/browser/native_app_launcher/native_app_navigation_controller_unittest.mm ('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 2181 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 } 2192 }
2193 2193
2194 - (void)initNativeAppNavigationController { 2194 - (void)initNativeAppNavigationController {
2195 if (browserState_->IsOffTheRecord()) 2195 if (browserState_->IsOffTheRecord())
2196 return; 2196 return;
2197 DCHECK(!nativeAppNavigationController_); 2197 DCHECK(!nativeAppNavigationController_);
2198 nativeAppNavigationController_.reset([[NativeAppNavigationController alloc] 2198 nativeAppNavigationController_.reset([[NativeAppNavigationController alloc]
2199 initWithWebState:self.webState 2199 initWithWebState:self.webState
2200 requestContextGetter:browserState_->GetRequestContext() 2200 requestContextGetter:browserState_->GetRequestContext()
2201 tab:self]); 2201 tab:self]);
2202 [self.webController addObserver:nativeAppNavigationController_];
2203 DCHECK(nativeAppNavigationController_); 2202 DCHECK(nativeAppNavigationController_);
2204 } 2203 }
2205 2204
2206 - (id<PassKitDialogProvider>)passKitDialogProvider { 2205 - (id<PassKitDialogProvider>)passKitDialogProvider {
2207 return passKitDialogProvider_.get(); 2206 return passKitDialogProvider_.get();
2208 } 2207 }
2209 2208
2210 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider { 2209 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider {
2211 passKitDialogProvider_.reset(provider); 2210 passKitDialogProvider_.reset(provider);
2212 } 2211 }
(...skipping 24 matching lines...) Expand all
2237 2236
2238 - (TabModel*)parentTabModel { 2237 - (TabModel*)parentTabModel {
2239 return parentTabModel_; 2238 return parentTabModel_;
2240 } 2239 }
2241 2240
2242 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2241 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2243 return inputAccessoryViewController_.get(); 2242 return inputAccessoryViewController_.get();
2244 } 2243 }
2245 2244
2246 @end 2245 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/native_app_launcher/native_app_navigation_controller_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698