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

Unified Diff: ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

Issue 2585233003: Upstream Chrome on iOS source code [2/11]. (Closed)
Patch Set: Created 4 years 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
Index: ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm
diff --git a/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm b/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm
new file mode 100644
index 0000000000000000000000000000000000000000..96ea9ff511f0acfad44c22d332b9064aa0792819
--- /dev/null
+++ b/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm
@@ -0,0 +1,119 @@
+// Copyright 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h"
+
+#include <memory>
+#include <utility>
+
+#include "base/logging.h"
+#include "base/strings/sys_string_conversions.h"
+#include "components/sessions/core/session_types.h"
+#include "components/sessions/ios/ios_serialized_navigation_builder.h"
+#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+#import "ios/chrome/browser/tabs/tab.h"
+#import "ios/chrome/browser/tabs/tab_model.h"
+#include "ios/chrome/browser/ui/browser_ios.h"
+#include "ios/chrome/browser/ui/browser_list_ios.h"
+#import "ios/web/navigation/navigation_manager_impl.h"
+#include "ios/web/public/navigation_item.h"
+#import "ios/web/web_state/web_state_impl.h"
+#import "net/base/mac/url_conversions.h"
+
+using web::WebStateImpl;
+
+TabRestoreServiceDelegateImplIOS::TabRestoreServiceDelegateImplIOS(
+ ios::ChromeBrowserState* browser_state)
+ : browser_state_(browser_state) {}
+
+TabRestoreServiceDelegateImplIOS::~TabRestoreServiceDelegateImplIOS() {}
+
+TabModel* TabRestoreServiceDelegateImplIOS::tab_model() const {
+ id<BrowserIOS> browser =
+ BrowserListIOS::GetLastActiveWithBrowserState(browser_state_);
+ return [browser tabModel];
+}
+
+void TabRestoreServiceDelegateImplIOS::ShowBrowserWindow() {
+ // No need to do anything here, as the singleton browser "window" is already
+ // shown.
+}
+
+const SessionID& TabRestoreServiceDelegateImplIOS::GetSessionID() const {
+ return session_id_;
+}
+
+int TabRestoreServiceDelegateImplIOS::GetTabCount() const {
+ return [tab_model() count];
+}
+
+int TabRestoreServiceDelegateImplIOS::GetSelectedIndex() const {
+ TabModel* tabModel = tab_model();
+ return [tabModel indexOfTab:[tabModel currentTab]];
+}
+
+std::string TabRestoreServiceDelegateImplIOS::GetAppName() const {
+ return std::string();
+}
+
+sessions::LiveTab* TabRestoreServiceDelegateImplIOS::GetLiveTabAt(
+ int index) const {
+ return nullptr;
+}
+
+sessions::LiveTab* TabRestoreServiceDelegateImplIOS::GetActiveLiveTab() const {
+ return nullptr;
+}
+
+bool TabRestoreServiceDelegateImplIOS::IsTabPinned(int index) const {
+ return false;
+}
+
+sessions::LiveTab* TabRestoreServiceDelegateImplIOS::AddRestoredTab(
+ const std::vector<sessions::SerializedNavigationEntry>& navigations,
+ int tab_index,
+ int selected_navigation,
+ const std::string& extension_app_id,
+ bool select,
+ bool pin,
+ bool from_last_session,
+ const sessions::PlatformSpecificTabData* tab_platform_data,
+ const std::string& user_agent_override) {
+ DCHECK_LT(selected_navigation, static_cast<int>(navigations.size()));
+
+ std::unique_ptr<WebStateImpl> webState(new WebStateImpl(browser_state_));
+ ScopedVector<web::NavigationItem> items =
+ sessions::IOSSerializedNavigationBuilder::ToNavigationItems(navigations);
+ webState->GetNavigationManagerImpl().ReplaceSessionHistory(
+ std::move(items), selected_navigation);
+ TabModel* tabModel = tab_model();
+ Tab* tab =
+ [tabModel insertTabWithWebState:std::move(webState) atIndex:tab_index];
+ // TODO(crbug.com/661636): Handle tab-switch animation somehow...
+ [tabModel setCurrentTab:tab];
+ return nullptr;
+}
+
+sessions::LiveTab* TabRestoreServiceDelegateImplIOS::ReplaceRestoredTab(
+ const std::vector<sessions::SerializedNavigationEntry>& navigations,
+ int selected_navigation,
+ bool from_last_session,
+ const std::string& extension_app_id,
+ const sessions::PlatformSpecificTabData* tab_platform_data,
+ const std::string& user_agent_override) {
+ DCHECK_LT(selected_navigation, static_cast<int>(navigations.size()));
+
+ // Desktop Chrome creates a new tab and deletes the old one. The net result
+ // is that the NTP is not in the session history of the restored tab. Do
+ // the same by replacing the tab's navigation history which will also force it
+ // to reload.
+ Tab* tab = tab_model().currentTab;
+ [tab replaceHistoryWithNavigations:navigations
+ currentIndex:selected_navigation];
+ return nullptr;
+}
+
+void TabRestoreServiceDelegateImplIOS::CloseTab() {
+ [[tab_model() currentTab] close];
+}

Powered by Google App Engine
This is Rietveld 408576698