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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.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_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_restore_service.h" 10 #include "apps/app_restore_service.h"
11 #include "apps/app_restore_service_factory.h" 11 #include "apps/app_restore_service_factory.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/environment.h" 16 #include "base/environment.h"
17 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.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/metrics/statistics_recorder.h" 20 #include "base/metrics/statistics_recorder.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/prefs/pref_service.h"
22 #include "base/string_split.h" 23 #include "base/string_split.h"
23 #include "base/strings/string_number_conversions.h" 24 #include "base/strings/string_number_conversions.h"
24 #include "base/threading/thread_restrictions.h" 25 #include "base/threading/thread_restrictions.h"
25 #include "base/utf_string_conversions.h" 26 #include "base/utf_string_conversions.h"
26 #include "chrome/browser/api/infobars/infobar_service.h" 27 #include "chrome/browser/api/infobars/infobar_service.h"
27 #include "chrome/browser/auto_launch_trial.h" 28 #include "chrome/browser/auto_launch_trial.h"
28 #include "chrome/browser/browser_process.h" 29 #include "chrome/browser/browser_process.h"
29 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 30 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
30 #include "chrome/browser/defaults.h" 31 #include "chrome/browser/defaults.h"
31 #include "chrome/browser/extensions/extension_creator.h" 32 #include "chrome/browser/extensions/extension_creator.h"
32 #include "chrome/browser/extensions/extension_service.h" 33 #include "chrome/browser/extensions/extension_service.h"
33 #include "chrome/browser/extensions/pack_extension_job.h" 34 #include "chrome/browser/extensions/pack_extension_job.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/predictor.h" 37 #include "chrome/browser/net/predictor.h"
37 #include "chrome/browser/net/url_fixer_upper.h" 38 #include "chrome/browser/net/url_fixer_upper.h"
38 #include "chrome/browser/notifications/desktop_notification_service.h" 39 #include "chrome/browser/notifications/desktop_notification_service.h"
39 #include "chrome/browser/performance_monitor/startup_timer.h" 40 #include "chrome/browser/performance_monitor/startup_timer.h"
40 #include "chrome/browser/prefs/incognito_mode_prefs.h" 41 #include "chrome/browser/prefs/incognito_mode_prefs.h"
41 #include "chrome/browser/prefs/pref_service.h"
42 #include "chrome/browser/prefs/session_startup_pref.h" 42 #include "chrome/browser/prefs/session_startup_pref.h"
43 #include "chrome/browser/profiles/profile.h" 43 #include "chrome/browser/profiles/profile.h"
44 #include "chrome/browser/profiles/profile_io_data.h" 44 #include "chrome/browser/profiles/profile_io_data.h"
45 #include "chrome/browser/rlz/rlz.h" 45 #include "chrome/browser/rlz/rlz.h"
46 #include "chrome/browser/sessions/session_restore.h" 46 #include "chrome/browser/sessions/session_restore.h"
47 #include "chrome/browser/sessions/session_service.h" 47 #include "chrome/browser/sessions/session_service.h"
48 #include "chrome/browser/sessions/session_service_factory.h" 48 #include "chrome/browser/sessions/session_service_factory.h"
49 #include "chrome/browser/shell_integration.h" 49 #include "chrome/browser/shell_integration.h"
50 #include "chrome/browser/ui/browser_commands.h" 50 #include "chrome/browser/ui/browser_commands.h"
51 #include "chrome/browser/ui/browser_finder.h" 51 #include "chrome/browser/ui/browser_finder.h"
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 } 941 }
942 942
943 #if !defined(OS_WIN) || defined(USE_AURA) 943 #if !defined(OS_WIN) || defined(USE_AURA)
944 // static 944 // static
945 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 945 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
946 Profile* profile, 946 Profile* profile,
947 const std::vector<GURL>& startup_urls) { 947 const std::vector<GURL>& startup_urls) {
948 return false; 948 return false;
949 } 949 }
950 #endif 950 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_browsertest.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698