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

Side by Side Diff: chrome/browser/sessions/session_restore.cc

Issue 7812036: Update base/timer.h code to pass through Location from call sites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/sessions/session_restore.h" 5 #include "chrome/browser/sessions/session_restore.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 217 }
218 } 218 }
219 } 219 }
220 220
221 if (!tabs_to_load_.empty()) { 221 if (!tabs_to_load_.empty()) {
222 force_load_timer_.Stop(); 222 force_load_timer_.Stop();
223 // Each time we load a tab we also set a timer to force us to start loading 223 // Each time we load a tab we also set a timer to force us to start loading
224 // the next tab if this one doesn't load quickly enough. 224 // the next tab if this one doesn't load quickly enough.
225 force_load_timer_.Start( 225 force_load_timer_.Start(
226 base::TimeDelta::FromMilliseconds(force_load_delay_), 226 base::TimeDelta::FromMilliseconds(force_load_delay_),
227 this, &TabLoader::ForceLoadTimerFired); 227 this, &TabLoader::ForceLoadTimerFired, FROM_HERE);
228 } 228 }
229 } 229 }
230 230
231 void TabLoader::Observe(int type, 231 void TabLoader::Observe(int type,
232 const NotificationSource& source, 232 const NotificationSource& source,
233 const NotificationDetails& details) { 233 const NotificationDetails& details) {
234 switch (type) { 234 switch (type) {
235 #if defined(OS_CHROMEOS) 235 #if defined(OS_CHROMEOS)
236 case chrome::NOTIFICATION_NETWORK_STATE_CHANGED: { 236 case chrome::NOTIFICATION_NETWORK_STATE_CHANGED: {
237 chromeos::NetworkStateDetails* state_details = 237 chromeos::NetworkStateDetails* state_details =
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 std::vector<GURL> gurls; 852 std::vector<GURL> gurls;
853 SessionRestoreImpl restorer(profile, 853 SessionRestoreImpl restorer(profile,
854 static_cast<Browser*>(NULL), true, false, true, gurls); 854 static_cast<Browser*>(NULL), true, false, true, gurls);
855 restorer.RestoreForeignTab(tab); 855 restorer.RestoreForeignTab(tab);
856 } 856 }
857 857
858 // static 858 // static
859 bool SessionRestore::IsRestoring() { 859 bool SessionRestore::IsRestoring() {
860 return restoring; 860 return restoring;
861 } 861 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698