OLD | NEW |
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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 @synthesize isLinkLoadingPrerenderTab = isLinkLoadingPrerenderTab_; | 475 @synthesize isLinkLoadingPrerenderTab = isLinkLoadingPrerenderTab_; |
476 @synthesize isVoiceSearchResultsTab = isVoiceSearchResultsTab_; | 476 @synthesize isVoiceSearchResultsTab = isVoiceSearchResultsTab_; |
477 @synthesize delegate = delegate_; | 477 @synthesize delegate = delegate_; |
478 @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_; | 478 @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_; |
479 @synthesize tabHeadersDelegate = tabHeadersDelegate_; | 479 @synthesize tabHeadersDelegate = tabHeadersDelegate_; |
480 | 480 |
481 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState | 481 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState |
482 opener:(Tab*)opener | 482 opener:(Tab*)opener |
483 openedByDOM:(BOOL)openedByDOM | 483 openedByDOM:(BOOL)openedByDOM |
484 model:(TabModel*)parentModel { | 484 model:(TabModel*)parentModel { |
485 std::unique_ptr<web::WebStateImpl> webState( | 485 web::WebState::CreateParams params(browserState); |
486 new web::WebStateImpl(browserState)); | 486 params.created_with_opener = openedByDOM; |
487 webState->GetNavigationManagerImpl().InitializeSession(openedByDOM); | 487 std::unique_ptr<web::WebState> webState = web::WebState::Create(params); |
488 if ([opener navigationManager]) { | 488 if ([opener navigationManager]) { |
489 web::SerializableUserDataManager* userDataManager = | 489 web::SerializableUserDataManager* userDataManager = |
490 web::SerializableUserDataManager::FromWebState(webState.get()); | 490 web::SerializableUserDataManager::FromWebState(webState.get()); |
491 userDataManager->AddSerializableData(opener.tabId, kOpenerIDKey); | 491 userDataManager->AddSerializableData(opener.tabId, kOpenerIDKey); |
492 userDataManager->AddSerializableData( | 492 userDataManager->AddSerializableData( |
493 @([opener navigationManager]->GetLastCommittedItemIndex()), | 493 @([opener navigationManager]->GetLastCommittedItemIndex()), |
494 kOpenerNavigationIndexKey); | 494 kOpenerNavigationIndexKey); |
495 } | 495 } |
496 | 496 |
497 return [self initWithWebState:std::move(webState) model:parentModel]; | 497 return [self initWithWebState:std::move(webState) model:parentModel]; |
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1498 web::NavigationManager* navigationManager = [self navigationManager]; | 1498 web::NavigationManager* navigationManager = [self navigationManager]; |
1499 DCHECK(navigationManager); | 1499 DCHECK(navigationManager); |
1500 web::NavigationItem* lastNonRedirectedItem = | 1500 web::NavigationItem* lastNonRedirectedItem = |
1501 GetLastNonRedirectedItem(navigationManager); | 1501 GetLastNonRedirectedItem(navigationManager); |
1502 if (!lastNonRedirectedItem) | 1502 if (!lastNonRedirectedItem) |
1503 return; | 1503 return; |
1504 | 1504 |
1505 // |reloadURL| will be empty if a page was open by DOM. | 1505 // |reloadURL| will be empty if a page was open by DOM. |
1506 GURL reloadURL(lastNonRedirectedItem->GetOriginalRequestURL()); | 1506 GURL reloadURL(lastNonRedirectedItem->GetOriginalRequestURL()); |
1507 if (reloadURL.is_empty()) { | 1507 if (reloadURL.is_empty()) { |
1508 DCHECK( | 1508 DCHECK(self.webState && self.webState->HasOpener()); |
1509 [[self navigationManagerImpl]->GetSessionController() isOpenedByDOM]); | |
1510 reloadURL = lastNonRedirectedItem->GetVirtualURL(); | 1509 reloadURL = lastNonRedirectedItem->GetVirtualURL(); |
1511 } | 1510 } |
1512 | 1511 |
1513 web::NavigationManager::WebLoadParams params(reloadURL); | 1512 web::NavigationManager::WebLoadParams params(reloadURL); |
1514 params.referrer = lastNonRedirectedItem->GetReferrer(); | 1513 params.referrer = lastNonRedirectedItem->GetReferrer(); |
1515 // A new navigation is needed here for reloading with desktop User-Agent. | 1514 // A new navigation is needed here for reloading with desktop User-Agent. |
1516 params.transition_type = | 1515 params.transition_type = |
1517 ui::PageTransitionFromInt(ui::PAGE_TRANSITION_FORM_SUBMIT); | 1516 ui::PageTransitionFromInt(ui::PAGE_TRANSITION_FORM_SUBMIT); |
1518 navigationManager->LoadURLWithParams(params); | 1517 navigationManager->LoadURLWithParams(params); |
1519 } | 1518 } |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2098 | 2097 |
2099 - (TabModel*)parentTabModel { | 2098 - (TabModel*)parentTabModel { |
2100 return parentTabModel_; | 2099 return parentTabModel_; |
2101 } | 2100 } |
2102 | 2101 |
2103 - (FormInputAccessoryViewController*)inputAccessoryViewController { | 2102 - (FormInputAccessoryViewController*)inputAccessoryViewController { |
2104 return inputAccessoryViewController_.get(); | 2103 return inputAccessoryViewController_.get(); |
2105 } | 2104 } |
2106 | 2105 |
2107 @end | 2106 @end |
OLD | NEW |