Index: ios/chrome/browser/tabs/tab.mm |
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm |
index eb22c9ba6bb60c95a0413dea86f9821b108d9bd1..cbb5b929db6b79f71b55cd06c8d6b8ae95b76f53 100644 |
--- a/ios/chrome/browser/tabs/tab.mm |
+++ b/ios/chrome/browser/tabs/tab.mm |
@@ -500,15 +500,13 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, |
@synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_; |
@synthesize tabHeadersDelegate = tabHeadersDelegate_; |
-- (instancetype)initWithWindowName:(NSString*)windowName |
- opener:(Tab*)opener |
- openedByDOM:(BOOL)openedByDOM |
- model:(TabModel*)parentModel |
- browserState:(ios::ChromeBrowserState*)browserState { |
+- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState |
+ opener:(Tab*)opener |
+ openedByDOM:(BOOL)openedByDOM |
+ model:(TabModel*)parentModel { |
std::unique_ptr<web::WebStateImpl> webState( |
new web::WebStateImpl(browserState)); |
- webState->GetNavigationManagerImpl().InitializeSession(windowName, |
- openedByDOM); |
+ webState->GetNavigationManagerImpl().InitializeSession(openedByDOM); |
if ([opener navigationManager]) { |
web::SerializableUserDataManager* userDataManager = |
web::SerializableUserDataManager::FromWebState(webState.get()); |
@@ -687,11 +685,10 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, |
opener:(Tab*)opener |
desktopUserAgent:(BOOL)desktopUserAgent |
configuration:(void (^)(Tab*))configuration { |
- Tab* tab = [[[Tab alloc] initWithWindowName:nil |
- opener:opener |
- openedByDOM:NO |
- model:nil |
- browserState:browserState] autorelease]; |
+ Tab* tab = [[[Tab alloc] initWithBrowserState:browserState |
+ opener:opener |
+ openedByDOM:NO |
+ model:nil] autorelease]; |
if (desktopUserAgent) |
[tab enableDesktopUserAgent]; |
[[tab webController] setNativeProvider:provider]; |
@@ -793,11 +790,6 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, |
return base::SysUTF16ToNSString(urlText); |
} |
-- (NSString*)windowName { |
- DCHECK([self navigationManager]); |
- return [self navigationManager]->GetSessionController().windowName; |
-} |
- |
- (NSString*)tabId { |
DCHECK(self.webState); |
web::SerializableUserDataManager* userDataManager = |
@@ -2179,7 +2171,6 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, |
base::scoped_nsobject<OpenUrlCommand> command([[OpenUrlCommand alloc] |
initWithURL:url |
referrer:web::Referrer() // Strip referrer when switching modes. |
- windowName:nil |
inIncognito:YES |
inBackground:NO |
appendTo:kLastTab]); |