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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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) 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/ui/startup/startup_browser_creator.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/environment.h" 14 #include "base/environment.h"
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/metrics/histogram.h" 19 #include "base/metrics/histogram.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/prefs/pref_service.h"
21 #include "base/string_split.h" 22 #include "base/string_split.h"
22 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
23 #include "base/threading/thread_restrictions.h" 24 #include "base/threading/thread_restrictions.h"
24 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
25 #include "chrome/browser/app_mode/app_mode_utils.h" 26 #include "chrome/browser/app_mode/app_mode_utils.h"
26 #include "chrome/browser/auto_launch_trial.h" 27 #include "chrome/browser/auto_launch_trial.h"
27 #include "chrome/browser/automation/automation_provider.h" 28 #include "chrome/browser/automation/automation_provider.h"
28 #include "chrome/browser/automation/automation_provider_list.h" 29 #include "chrome/browser/automation/automation_provider_list.h"
29 #include "chrome/browser/automation/chrome_frame_automation_provider.h" 30 #include "chrome/browser/automation/chrome_frame_automation_provider.h"
30 #include "chrome/browser/automation/testing_automation_provider.h" 31 #include "chrome/browser/automation/testing_automation_provider.h"
31 #include "chrome/browser/browser_process.h" 32 #include "chrome/browser/browser_process.h"
32 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 33 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
33 #include "chrome/browser/extensions/startup_helper.h" 34 #include "chrome/browser/extensions/startup_helper.h"
34 #include "chrome/browser/first_run/first_run.h" 35 #include "chrome/browser/first_run/first_run.h"
35 #include "chrome/browser/google/google_util.h" 36 #include "chrome/browser/google/google_util.h"
36 #include "chrome/browser/net/url_fixer_upper.h" 37 #include "chrome/browser/net/url_fixer_upper.h"
37 #include "chrome/browser/notifications/desktop_notification_service.h" 38 #include "chrome/browser/notifications/desktop_notification_service.h"
38 #include "chrome/browser/prefs/incognito_mode_prefs.h" 39 #include "chrome/browser/prefs/incognito_mode_prefs.h"
39 #include "chrome/browser/prefs/pref_service.h"
40 #include "chrome/browser/prefs/session_startup_pref.h" 40 #include "chrome/browser/prefs/session_startup_pref.h"
41 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 41 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
42 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 42 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
43 #include "chrome/browser/printing/print_dialog_cloud.h" 43 #include "chrome/browser/printing/print_dialog_cloud.h"
44 #include "chrome/browser/profiles/profile.h" 44 #include "chrome/browser/profiles/profile.h"
45 #include "chrome/browser/profiles/profile_manager.h" 45 #include "chrome/browser/profiles/profile_manager.h"
46 #include "chrome/browser/search_engines/template_url.h" 46 #include "chrome/browser/search_engines/template_url.h"
47 #include "chrome/browser/search_engines/template_url_service.h" 47 #include "chrome/browser/search_engines/template_url_service.h"
48 #include "chrome/browser/search_engines/template_url_service_factory.h" 48 #include "chrome/browser/search_engines/template_url_service_factory.h"
49 #include "chrome/browser/ui/browser.h" 49 #include "chrome/browser/ui/browser.h"
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 684
685 // static 685 // static
686 bool StartupBrowserCreator::ActivatedProfile() { 686 bool StartupBrowserCreator::ActivatedProfile() {
687 return profile_launch_observer.Get().activated_profile(); 687 return profile_launch_observer.Get().activated_profile();
688 } 688 }
689 689
690 bool HasPendingUncleanExit(Profile* profile) { 690 bool HasPendingUncleanExit(Profile* profile) {
691 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && 691 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
692 !profile_launch_observer.Get().HasBeenLaunched(profile); 692 !profile_launch_observer.Get().HasBeenLaunched(profile);
693 } 693 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698