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

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

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "base/stl_util-inl.h" 15 #include "base/stl_util-inl.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "chrome/browser/extensions/extension_service.h" 17 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/sessions/session_service.h" 19 #include "chrome/browser/sessions/session_service.h"
20 #include "chrome/browser/sessions/session_types.h" 20 #include "chrome/browser/sessions/session_types.h"
21 #include "chrome/browser/tab_contents/navigation_controller.h" 21 #include "chrome/browser/tab_contents/navigation_controller.h"
22 #include "chrome/browser/tab_contents/tab_contents.h" 22 #include "chrome/browser/tab_contents/tab_contents.h"
23 #include "chrome/browser/tab_contents/tab_contents_view.h" 23 #include "chrome/browser/tab_contents/tab_contents_view.h"
24 #include "chrome/browser/tabs/tab_strip_model.h" 24 #include "chrome/browser/tabs/tab_strip_model.h"
25 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_list.h" 26 #include "chrome/browser/ui/browser_list.h"
27 #include "chrome/browser/ui/browser_navigator.h" 27 #include "chrome/browser/ui/browser_navigator.h"
28 #include "chrome/browser/ui/browser_window.h" 28 #include "chrome/browser/ui/browser_window.h"
29 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/notification_registrar.h" 29 #include "chrome/common/notification_registrar.h"
31 #include "chrome/common/notification_service.h" 30 #include "chrome/common/notification_service.h"
32 31
33 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
34 #include "chrome/browser/chromeos/boot_times_loader.h" 33 #include "chrome/browser/chromeos/boot_times_loader.h"
35 #include "chrome/browser/chromeos/network_state_notifier.h" 34 #include "chrome/browser/chromeos/network_state_notifier.h"
36 #endif 35 #endif
37 36
38 // Are we in the process of restoring? 37 // Are we in the process of restoring?
39 static bool restoring = false; 38 static bool restoring = false;
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 void SessionRestore::RestoreSessionSynchronously( 613 void SessionRestore::RestoreSessionSynchronously(
615 Profile* profile, 614 Profile* profile,
616 const std::vector<GURL>& urls_to_open) { 615 const std::vector<GURL>& urls_to_open) {
617 Restore(profile, NULL, true, false, true, urls_to_open); 616 Restore(profile, NULL, true, false, true, urls_to_open);
618 } 617 }
619 618
620 // static 619 // static
621 bool SessionRestore::IsRestoring() { 620 bool SessionRestore::IsRestoring() {
622 return restoring; 621 return restoring;
623 } 622 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698