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

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

Issue 2600583002: Remove ScopedVector from components/sessions. (Closed)
Patch Set: include 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 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 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 storeKitLauncher_.reset(storeKitLauncher); 890 storeKitLauncher_.reset(storeKitLauncher);
891 } 891 }
892 892
893 // Swap out the existing session history with a new list of navigations. Forces 893 // Swap out the existing session history with a new list of navigations. Forces
894 // the tab to reload to update the UI accordingly. This is ok because none of 894 // the tab to reload to update the UI accordingly. This is ok because none of
895 // the session history is stored in the tab; it's always fetched through the 895 // the session history is stored in the tab; it's always fetched through the
896 // navigation manager. 896 // navigation manager.
897 - (void)replaceHistoryWithNavigations: 897 - (void)replaceHistoryWithNavigations:
898 (const std::vector<sessions::SerializedNavigationEntry>&)navigations 898 (const std::vector<sessions::SerializedNavigationEntry>&)navigations
899 currentIndex:(NSInteger)currentIndex { 899 currentIndex:(NSInteger)currentIndex {
900 ScopedVector<web::NavigationItem> items = 900 std::vector<std::unique_ptr<web::NavigationItem>> items =
901 sessions::IOSSerializedNavigationBuilder::ToNavigationItems(navigations); 901 sessions::IOSSerializedNavigationBuilder::ToNavigationItems(navigations);
902 [self navigationManager]->ReplaceSessionHistory(std::move(items), 902 [self navigationManager]->ReplaceSessionHistory(std::move(items),
903 currentIndex); 903 currentIndex);
904 [self didReplaceSessionHistory]; 904 [self didReplaceSessionHistory];
905 905
906 [self.webController loadCurrentURL]; 906 [self.webController loadCurrentURL];
907 } 907 }
908 908
909 - (void)didReplaceSessionHistory { 909 - (void)didReplaceSessionHistory {
910 // Replace fullScreenController_ with a new sessionID when the navigation 910 // Replace fullScreenController_ with a new sessionID when the navigation
(...skipping 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
2451 2451
2452 - (TabModel*)parentTabModel { 2452 - (TabModel*)parentTabModel {
2453 return parentTabModel_; 2453 return parentTabModel_;
2454 } 2454 }
2455 2455
2456 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2456 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2457 return inputAccessoryViewController_.get(); 2457 return inputAccessoryViewController_.get();
2458 } 2458 }
2459 2459
2460 @end 2460 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm ('k') | ios/web/navigation/crw_session_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698