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

Unified Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2655463014: Pass the correct webState to the nativeContent. (Closed)
Patch Set: s/ithW// 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/ui/browser_view_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index f38c59b5587cf128b375369858b3fd2eba327e9d..85f944fdb02106e2b5f2f3361225ccba7e6155a0 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -2915,7 +2915,8 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
host == kChromeUITermsHost || host == kChromeUIOfflineHost;
}
-- (id<CRWNativeContent>)controllerForURL:(const GURL&)url {
+- (id<CRWNativeContent>)controllerForURL:(const GURL&)url
+ webState:(web::WebState*)webState {
DCHECK(url.SchemeIs(kChromeUIScheme));
id<CRWNativeContent> nativeController = nil;
@@ -2968,7 +2969,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
StaticHtmlNativeContent* staticNativeController =
[[[OfflinePageNativeContent alloc] initWithLoader:self
browserState:_browserState
- webState:[self currentWebState]
+ webState:webState
URL:url] autorelease];
[self setOverScrollActionControllerToStaticNativeContent:
staticNativeController];
« no previous file with comments | « no previous file | ios/chrome/browser/ui/browser_view_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698