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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #include "chrome/browser/ui/browser_finder.h" | 49 #include "chrome/browser/ui/browser_finder.h" |
50 #include "chrome/browser/ui/browser_window.h" | 50 #include "chrome/browser/ui/browser_window.h" |
51 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 51 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
52 #include "chrome/common/chrome_constants.h" | 52 #include "chrome/common/chrome_constants.h" |
53 #include "chrome/common/chrome_paths.h" | 53 #include "chrome/common/chrome_paths.h" |
54 #include "chrome/common/chrome_result_codes.h" | 54 #include "chrome/common/chrome_result_codes.h" |
55 #include "chrome/common/chrome_switches.h" | 55 #include "chrome/common/chrome_switches.h" |
56 #include "chrome/common/chrome_version_info.h" | 56 #include "chrome/common/chrome_version_info.h" |
57 #include "chrome/common/net/url_fixer_upper.h" | 57 #include "chrome/common/net/url_fixer_upper.h" |
58 #include "chrome/common/pref_names.h" | 58 #include "chrome/common/pref_names.h" |
59 #include "chrome/common/profile_management_switches.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" |
| 61 #include "components/signin/core/common/profile_management_switches.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 |
70 #if defined(USE_ASH) | 70 #if defined(USE_ASH) |
71 #include "ash/shell.h" | 71 #include "ash/shell.h" |
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 } | 739 } |
740 | 740 |
741 if (command_line.HasSwitch(switches::kProfileDirectory)) { | 741 if (command_line.HasSwitch(switches::kProfileDirectory)) { |
742 return user_data_dir.Append( | 742 return user_data_dir.Append( |
743 command_line.GetSwitchValuePath(switches::kProfileDirectory)); | 743 command_line.GetSwitchValuePath(switches::kProfileDirectory)); |
744 } | 744 } |
745 | 745 |
746 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 746 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
747 user_data_dir); | 747 user_data_dir); |
748 } | 748 } |
OLD | NEW |