OLD | NEW |
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 "apps/app_load_service.h" | 10 #include "apps/app_load_service.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "base/strings/utf_string_conversions.h" | 28 #include "base/strings/utf_string_conversions.h" |
29 #include "base/threading/thread_restrictions.h" | 29 #include "base/threading/thread_restrictions.h" |
30 #include "chrome/browser/app_mode/app_mode_utils.h" | 30 #include "chrome/browser/app_mode/app_mode_utils.h" |
31 #include "chrome/browser/auto_launch_trial.h" | 31 #include "chrome/browser/auto_launch_trial.h" |
32 #include "chrome/browser/browser_process.h" | 32 #include "chrome/browser/browser_process.h" |
33 #include "chrome/browser/chrome_notification_types.h" | 33 #include "chrome/browser/chrome_notification_types.h" |
34 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 34 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
35 #include "chrome/browser/extensions/startup_helper.h" | 35 #include "chrome/browser/extensions/startup_helper.h" |
36 #include "chrome/browser/extensions/unpacked_installer.h" | 36 #include "chrome/browser/extensions/unpacked_installer.h" |
37 #include "chrome/browser/first_run/first_run.h" | 37 #include "chrome/browser/first_run/first_run.h" |
38 #include "chrome/browser/google/google_util.h" | |
39 #include "chrome/browser/notifications/desktop_notification_service.h" | 38 #include "chrome/browser/notifications/desktop_notification_service.h" |
40 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 39 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
41 #include "chrome/browser/prefs/session_startup_pref.h" | 40 #include "chrome/browser/prefs/session_startup_pref.h" |
42 #include "chrome/browser/profiles/profile.h" | 41 #include "chrome/browser/profiles/profile.h" |
43 #include "chrome/browser/profiles/profile_manager.h" | 42 #include "chrome/browser/profiles/profile_manager.h" |
44 #include "chrome/browser/profiles/profiles_state.h" | 43 #include "chrome/browser/profiles/profiles_state.h" |
45 #include "chrome/browser/search_engines/util.h" | 44 #include "chrome/browser/search_engines/util.h" |
46 #include "chrome/browser/ui/app_list/app_list_service.h" | 45 #include "chrome/browser/ui/app_list/app_list_service.h" |
47 #include "chrome/browser/ui/browser.h" | 46 #include "chrome/browser/ui/browser.h" |
48 #include "chrome/browser/ui/browser_dialogs.h" | 47 #include "chrome/browser/ui/browser_dialogs.h" |
49 #include "chrome/browser/ui/browser_finder.h" | 48 #include "chrome/browser/ui/browser_finder.h" |
50 #include "chrome/browser/ui/browser_window.h" | 49 #include "chrome/browser/ui/browser_window.h" |
51 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 50 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
52 #include "chrome/common/chrome_constants.h" | 51 #include "chrome/common/chrome_constants.h" |
53 #include "chrome/common/chrome_paths.h" | 52 #include "chrome/common/chrome_paths.h" |
54 #include "chrome/common/chrome_result_codes.h" | 53 #include "chrome/common/chrome_result_codes.h" |
55 #include "chrome/common/chrome_switches.h" | 54 #include "chrome/common/chrome_switches.h" |
56 #include "chrome/common/chrome_version_info.h" | 55 #include "chrome/common/chrome_version_info.h" |
57 #include "chrome/common/pref_names.h" | 56 #include "chrome/common/pref_names.h" |
58 #include "chrome/common/url_constants.h" | 57 #include "chrome/common/url_constants.h" |
59 #include "chrome/installer/util/browser_distribution.h" | 58 #include "chrome/installer/util/browser_distribution.h" |
| 59 #include "components/google/core/browser/google_util.h" |
60 #include "components/signin/core/common/profile_management_switches.h" | 60 #include "components/signin/core/common/profile_management_switches.h" |
61 #include "components/url_fixer/url_fixer.h" | 61 #include "components/url_fixer/url_fixer.h" |
62 #include "content/public/browser/browser_thread.h" | 62 #include "content/public/browser/browser_thread.h" |
63 #include "content/public/browser/child_process_security_policy.h" | 63 #include "content/public/browser/child_process_security_policy.h" |
64 #include "content/public/browser/navigation_controller.h" | 64 #include "content/public/browser/navigation_controller.h" |
65 #include "grit/locale_settings.h" | 65 #include "grit/locale_settings.h" |
66 #include "net/base/net_util.h" | 66 #include "net/base/net_util.h" |
67 #include "ui/base/l10n/l10n_util.h" | 67 #include "ui/base/l10n/l10n_util.h" |
68 #include "ui/base/resource/resource_bundle.h" | 68 #include "ui/base/resource/resource_bundle.h" |
69 | 69 |
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 } | 737 } |
738 | 738 |
739 if (command_line.HasSwitch(switches::kProfileDirectory)) { | 739 if (command_line.HasSwitch(switches::kProfileDirectory)) { |
740 return user_data_dir.Append( | 740 return user_data_dir.Append( |
741 command_line.GetSwitchValuePath(switches::kProfileDirectory)); | 741 command_line.GetSwitchValuePath(switches::kProfileDirectory)); |
742 } | 742 } |
743 | 743 |
744 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 744 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
745 user_data_dir); | 745 user_data_dir); |
746 } | 746 } |
OLD | NEW |