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

Unified Diff: chrome/browser/sessions/tab_restore_service_helper.cc

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/base_session_service.h ('k') | chrome/browser/signin/oauth2_token_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/tab_restore_service_helper.cc
diff --git a/chrome/browser/sessions/tab_restore_service_helper.cc b/chrome/browser/sessions/tab_restore_service_helper.cc
index 0b0e0e5bda5c3acadc1f54aac9d6d41f3c436415..2b138618729f929c213c234b7796eb12e0daf0ee 100644
--- a/chrome/browser/sessions/tab_restore_service_helper.cc
+++ b/chrome/browser/sessions/tab_restore_service_helper.cc
@@ -234,15 +234,16 @@ void TabRestoreServiceHelper::RestoreEntryById(
window->app_name);
for (size_t tab_i = 0; tab_i < window->tabs.size(); ++tab_i) {
const Tab& tab = window->tabs[tab_i];
- WebContents* restored_tab =
- delegate->AddRestoredTab(tab.navigations, delegate->GetTabCount(),
- tab.current_navigation_index,
- tab.extension_app_id,
- static_cast<int>(tab_i) ==
- window->selected_tab_index,
- tab.pinned, tab.from_last_session,
- tab.session_storage_namespace,
- tab.user_agent_override);
+ WebContents* restored_tab = delegate->AddRestoredTab(
+ tab.navigations,
+ delegate->GetTabCount(),
+ tab.current_navigation_index,
+ tab.extension_app_id,
+ static_cast<int>(tab_i) == window->selected_tab_index,
+ tab.pinned,
+ tab.from_last_session,
+ tab.session_storage_namespace.get(),
+ tab.user_agent_override);
if (restored_tab) {
restored_tab->GetController().LoadIfNecessary();
RecordAppLaunch(profile_, tab);
@@ -439,7 +440,7 @@ TabRestoreServiceDelegate* TabRestoreServiceHelper::RestoreTab(
tab.current_navigation_index,
tab.from_last_session,
tab.extension_app_id,
- tab.session_storage_namespace,
+ tab.session_storage_namespace.get(),
tab.user_agent_override);
} else {
// We only respsect the tab's original browser if there's no disposition.
@@ -469,16 +470,16 @@ TabRestoreServiceDelegate* TabRestoreServiceHelper::RestoreTab(
tab_index = delegate->GetTabCount();
}
- WebContents* web_contents = delegate->AddRestoredTab(
- tab.navigations,
- tab_index,
- tab.current_navigation_index,
- tab.extension_app_id,
- disposition != NEW_BACKGROUND_TAB,
- tab.pinned,
- tab.from_last_session,
- tab.session_storage_namespace,
- tab.user_agent_override);
+ WebContents* web_contents =
+ delegate->AddRestoredTab(tab.navigations,
+ tab_index,
+ tab.current_navigation_index,
+ tab.extension_app_id,
+ disposition != NEW_BACKGROUND_TAB,
+ tab.pinned,
+ tab.from_last_session,
+ tab.session_storage_namespace.get(),
+ tab.user_agent_override);
web_contents->GetController().LoadIfNecessary();
}
RecordAppLaunch(profile_, tab);
« no previous file with comments | « chrome/browser/sessions/base_session_service.h ('k') | chrome/browser/signin/oauth2_token_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698