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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "chrome/browser/ui/browser.h" | 48 #include "chrome/browser/ui/browser.h" |
49 #include "chrome/browser/ui/browser_dialogs.h" | 49 #include "chrome/browser/ui/browser_dialogs.h" |
50 #include "chrome/browser/ui/browser_finder.h" | 50 #include "chrome/browser/ui/browser_finder.h" |
51 #include "chrome/browser/ui/browser_window.h" | 51 #include "chrome/browser/ui/browser_window.h" |
52 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 52 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
53 #include "chrome/browser/ui/user_manager.h" | 53 #include "chrome/browser/ui/user_manager.h" |
54 #include "chrome/common/chrome_constants.h" | 54 #include "chrome/common/chrome_constants.h" |
55 #include "chrome/common/chrome_paths.h" | 55 #include "chrome/common/chrome_paths.h" |
56 #include "chrome/common/chrome_result_codes.h" | 56 #include "chrome/common/chrome_result_codes.h" |
57 #include "chrome/common/chrome_switches.h" | 57 #include "chrome/common/chrome_switches.h" |
58 #include "chrome/common/chrome_version_info.h" | |
59 #include "chrome/common/pref_names.h" | 58 #include "chrome/common/pref_names.h" |
60 #include "chrome/common/url_constants.h" | 59 #include "chrome/common/url_constants.h" |
61 #include "chrome/installer/util/browser_distribution.h" | 60 #include "chrome/installer/util/browser_distribution.h" |
62 #include "components/google/core/browser/google_util.h" | 61 #include "components/google/core/browser/google_util.h" |
63 #include "components/search_engines/util.h" | 62 #include "components/search_engines/util.h" |
64 #include "components/signin/core/common/profile_management_switches.h" | 63 #include "components/signin/core/common/profile_management_switches.h" |
65 #include "components/url_fixer/url_fixer.h" | 64 #include "components/url_fixer/url_fixer.h" |
66 #include "content/public/browser/browser_thread.h" | 65 #include "content/public/browser/browser_thread.h" |
67 #include "content/public/browser/child_process_security_policy.h" | 66 #include "content/public/browser/child_process_security_policy.h" |
68 #include "content/public/browser/navigation_controller.h" | 67 #include "content/public/browser/navigation_controller.h" |
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 // If we are showing the app list then chrome isn't shown so load the app | 844 // If we are showing the app list then chrome isn't shown so load the app |
846 // list's profile rather than chrome's. | 845 // list's profile rather than chrome's. |
847 if (command_line.HasSwitch(switches::kShowAppList)) { | 846 if (command_line.HasSwitch(switches::kShowAppList)) { |
848 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> | 847 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> |
849 GetProfilePath(user_data_dir); | 848 GetProfilePath(user_data_dir); |
850 } | 849 } |
851 | 850 |
852 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 851 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
853 user_data_dir); | 852 user_data_dir); |
854 } | 853 } |
OLD | NEW |