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

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

Issue 7966020: [Sync] Fix Session's handling of windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 9 years, 3 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
Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 62afa4f54796a30655842bac580612986aa7bf16..fd4e4e2e7c2f520adad49fea3525f748290e1079 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -446,12 +446,12 @@ class SessionRestoreImpl : public NotificationObserver {
// Restore window(s) from a foreign session.
void RestoreForeignSession(
- std::vector<SessionWindow*>::const_iterator begin,
- std::vector<SessionWindow*>::const_iterator end) {
+ std::vector<const SessionWindow*>::const_iterator begin,
+ std::vector<const SessionWindow*>::const_iterator end) {
StartTabCreation();
// Create a browser instance to put the restored tabs in.
- for (std::vector<SessionWindow*>::const_iterator i = begin;
- i != end; ++i) {
+ for (std::vector<const SessionWindow*>::const_iterator i = begin;
+ i != end; ++i) {
Browser* browser = CreateRestoredBrowser(
static_cast<Browser::Type>((*i)->type),
(*i)->bounds,
@@ -842,8 +842,8 @@ Browser* SessionRestore::RestoreSession(Profile* profile,
// static
void SessionRestore::RestoreForeignSessionWindows(
Profile* profile,
- std::vector<SessionWindow*>::const_iterator begin,
- std::vector<SessionWindow*>::const_iterator end) {
+ std::vector<const SessionWindow*>::const_iterator begin,
+ std::vector<const SessionWindow*>::const_iterator end) {
// Create a SessionRestore object to eventually restore the tabs.
std::vector<GURL> gurls;
SessionRestoreImpl restorer(profile,

Powered by Google App Engine
This is Rietveld 408576698