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

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

Issue 2731443003: Removed CRWWebController dependency from NativeAppNavigationController. (Closed)
Patch Set: Addressed review comments 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
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 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 } 2179 }
2180 2180
2181 - (void)initNativeAppNavigationController { 2181 - (void)initNativeAppNavigationController {
2182 if (browserState_->IsOffTheRecord()) 2182 if (browserState_->IsOffTheRecord())
2183 return; 2183 return;
2184 DCHECK(!nativeAppNavigationController_); 2184 DCHECK(!nativeAppNavigationController_);
2185 nativeAppNavigationController_.reset([[NativeAppNavigationController alloc] 2185 nativeAppNavigationController_.reset([[NativeAppNavigationController alloc]
2186 initWithWebState:self.webState 2186 initWithWebState:self.webState
2187 requestContextGetter:browserState_->GetRequestContext() 2187 requestContextGetter:browserState_->GetRequestContext()
2188 tab:self]); 2188 tab:self]);
2189 [self.webController addObserver:nativeAppNavigationController_];
2190 DCHECK(nativeAppNavigationController_); 2189 DCHECK(nativeAppNavigationController_);
2191 } 2190 }
2192 2191
2193 - (id<PassKitDialogProvider>)passKitDialogProvider { 2192 - (id<PassKitDialogProvider>)passKitDialogProvider {
2194 return passKitDialogProvider_.get(); 2193 return passKitDialogProvider_.get();
2195 } 2194 }
2196 2195
2197 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider { 2196 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider {
2198 passKitDialogProvider_.reset(provider); 2197 passKitDialogProvider_.reset(provider);
2199 } 2198 }
(...skipping 24 matching lines...) Expand all
2224 2223
2225 - (TabModel*)parentTabModel { 2224 - (TabModel*)parentTabModel {
2226 return parentTabModel_; 2225 return parentTabModel_;
2227 } 2226 }
2228 2227
2229 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2228 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2230 return inputAccessoryViewController_.get(); 2229 return inputAccessoryViewController_.get();
2231 } 2230 }
2232 2231
2233 @end 2232 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698