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

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

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 10 #include <string>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 virtual ~TabLoader(); 120 virtual ~TabLoader();
121 121
122 // Loads the next tab. If there are no more tabs to load this deletes itself, 122 // Loads the next tab. If there are no more tabs to load this deletes itself,
123 // otherwise |force_load_timer_| is restarted. 123 // otherwise |force_load_timer_| is restarted.
124 void LoadNextTab(); 124 void LoadNextTab();
125 125
126 // NotificationObserver method. Removes the specified tab and loads the next 126 // NotificationObserver method. Removes the specified tab and loads the next
127 // tab. 127 // tab.
128 virtual void Observe(int type, 128 virtual void Observe(int type,
129 const content::NotificationSource& source, 129 const content::NotificationSource& source,
130 const content::NotificationDetails& details) OVERRIDE; 130 const content::NotificationDetails& details) override;
131 131
132 // net::NetworkChangeNotifier::ConnectionTypeObserver overrides. 132 // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
133 virtual void OnConnectionTypeChanged( 133 virtual void OnConnectionTypeChanged(
134 net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; 134 net::NetworkChangeNotifier::ConnectionType type) override;
135 135
136 // Removes the listeners from the specified tab and removes the tab from 136 // Removes the listeners from the specified tab and removes the tab from
137 // the set of tabs to load and list of tabs we're waiting to get a load 137 // the set of tabs to load and list of tabs we're waiting to get a load
138 // from. 138 // from.
139 void RemoveTab(NavigationController* tab); 139 void RemoveTab(NavigationController* tab);
140 140
141 // Invoked from |force_load_timer_|. Doubles |force_load_delay_| and invokes 141 // Invoked from |force_load_timer_|. Doubles |force_load_delay_| and invokes
142 // |LoadNextTab| to load the next tab 142 // |LoadNextTab| to load the next tab
143 void ForceLoadTimerFired(); 143 void ForceLoadTimerFired();
144 144
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 if (active_session_restorers->empty()) { 692 if (active_session_restorers->empty()) {
693 delete active_session_restorers; 693 delete active_session_restorers;
694 active_session_restorers = NULL; 694 active_session_restorers = NULL;
695 } 695 }
696 696
697 g_browser_process->ReleaseModule(); 697 g_browser_process->ReleaseModule();
698 } 698 }
699 699
700 virtual void Observe(int type, 700 virtual void Observe(int type,
701 const content::NotificationSource& source, 701 const content::NotificationSource& source,
702 const content::NotificationDetails& details) OVERRIDE { 702 const content::NotificationDetails& details) override {
703 switch (type) { 703 switch (type) {
704 case chrome::NOTIFICATION_BROWSER_CLOSED: 704 case chrome::NOTIFICATION_BROWSER_CLOSED:
705 delete this; 705 delete this;
706 return; 706 return;
707 707
708 default: 708 default:
709 NOTREACHED(); 709 NOTREACHED();
710 break; 710 break;
711 } 711 }
712 } 712 }
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 if (!active_session_restorers) 1289 if (!active_session_restorers)
1290 return false; 1290 return false;
1291 for (std::set<SessionRestoreImpl*>::const_iterator it = 1291 for (std::set<SessionRestoreImpl*>::const_iterator it =
1292 active_session_restorers->begin(); 1292 active_session_restorers->begin();
1293 it != active_session_restorers->end(); ++it) { 1293 it != active_session_restorers->end(); ++it) {
1294 if ((*it)->synchronous()) 1294 if ((*it)->synchronous())
1295 return true; 1295 return true;
1296 } 1296 }
1297 return false; 1297 return false;
1298 } 1298 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/restore_on_startup_policy_handler.h ('k') | chrome/browser/sessions/session_restore_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698