summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_tabrestore.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 22:22:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 22:22:03 +0000
commit52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17 (patch)
treef39b0d32959778625fdeb00f178061a6411213c3 /chrome/browser/ui/browser_tabrestore.cc
parent78ce87fbedda14f033aaaf474b94c4966e8bf3d0 (diff)
downloadchromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.zip
chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.gz
chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.bz2
Move tab functions off Browser into browser_tabstrip and browser_tabrestore.
http://crbug.com/133576 TEST=none Review URL: https://chromiumcodereview.appspot.com/10702029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_tabrestore.cc')
-rw-r--r--chrome/browser/ui/browser_tabrestore.cc117
1 files changed, 117 insertions, 0 deletions
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
new file mode 100644
index 0000000..74aca77
--- /dev/null
+++ b/chrome/browser/ui/browser_tabrestore.cc
@@ -0,0 +1,117 @@
+// Copyright (c) 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 "chrome/browser/ui/browser_tabrestore.h"
+
+#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
+#include "ipc/ipc_message.h"
+
+using content::WebContents;
+using content::NavigationController;
+using content::NavigationEntry;
+
+namespace chrome {
+
+int GetIndexForInsertionDuringRestore(Browser* browser, int relative_index) {
+ return (browser->tab_strip_model()->insertion_policy() ==
+ TabStripModel::INSERT_AFTER) ? browser->tab_count() : relative_index;
+}
+
+content::WebContents* AddRestoredTab(
+ Browser* browser,
+ const std::vector<TabNavigation>& navigations,
+ int tab_index,
+ int selected_navigation,
+ const std::string& extension_app_id,
+ bool select,
+ bool pin,
+ bool from_last_session,
+ content::SessionStorageNamespace* storage_namespace) {
+ GURL restore_url = navigations.at(selected_navigation).virtual_url();
+ TabContents* tab_contents = chrome::TabContentsFactory(
+ browser->profile(),
+ tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url),
+ MSG_ROUTING_NONE,
+ chrome::GetActiveWebContents(browser),
+ storage_namespace);
+ WebContents* new_tab = tab_contents->web_contents();
+ tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id);
+ std::vector<NavigationEntry*> entries;
+ TabNavigation::CreateNavigationEntriesFromTabNavigations(
+ browser->profile(), navigations, &entries);
+ new_tab->GetController().Restore(
+ selected_navigation, from_last_session, &entries);
+ DCHECK_EQ(0u, entries.size());
+
+ int add_types = select ? TabStripModel::ADD_ACTIVE :
+ TabStripModel::ADD_NONE;
+ if (pin) {
+ int first_mini_tab_idx =
+ browser->tab_strip_model()->IndexOfFirstNonMiniTab();
+ tab_index = std::min(tab_index, first_mini_tab_idx);
+ add_types |= TabStripModel::ADD_PINNED;
+ }
+ browser->tab_strip_model()->InsertTabContentsAt(tab_index, tab_contents,
+ add_types);
+ if (select) {
+ browser->window()->Activate();
+ } else {
+ // We set the size of the view here, before WebKit does its initial
+ // layout. If we don't, the initial layout of background tabs will be
+ // performed with a view width of 0, which may cause script outputs and
+ // anchor link location calculations to be incorrect even after a new
+ // layout with proper view dimensions. TabStripModel::AddTabContents()
+ // contains similar logic.
+ new_tab->GetView()->SizeContents(
+ browser->window()->GetRestoredBounds().size());
+ new_tab->WasHidden();
+ }
+ SessionService* session_service =
+ SessionServiceFactory::GetForProfileIfExisting(browser->profile());
+ if (session_service)
+ session_service->TabRestored(tab_contents, pin);
+ return new_tab;
+}
+
+void ReplaceRestoredTab(
+ Browser* browser,
+ const std::vector<TabNavigation>& navigations,
+ int selected_navigation,
+ bool from_last_session,
+ const std::string& extension_app_id,
+ content::SessionStorageNamespace* session_storage_namespace) {
+ GURL restore_url = navigations.at(selected_navigation).virtual_url();
+ TabContents* tab_contents = chrome::TabContentsFactory(
+ browser->profile(),
+ tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url),
+ MSG_ROUTING_NONE,
+ GetActiveWebContents(browser),
+ session_storage_namespace);
+ tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id);
+ WebContents* replacement = tab_contents->web_contents();
+ std::vector<NavigationEntry*> entries;
+ TabNavigation::CreateNavigationEntriesFromTabNavigations(
+ browser->profile(), navigations, &entries);
+ replacement->GetController().Restore(
+ selected_navigation, from_last_session, &entries);
+ DCHECK_EQ(0u, entries.size());
+
+ browser->tab_strip_model()->ReplaceNavigationControllerAt(
+ browser->active_index(),
+ tab_contents);
+}
+
+} // namespace chrome