| 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 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 5 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 bool show_main_browser_window() const { | 100 bool show_main_browser_window() const { |
| 101 return show_main_browser_window_; | 101 return show_main_browser_window_; |
| 102 } | 102 } |
| 103 | 103 |
| 104 // For faking that no profiles have been launched yet. | 104 // For faking that no profiles have been launched yet. |
| 105 static void ClearLaunchedProfilesForTesting(); | 105 static void ClearLaunchedProfilesForTesting(); |
| 106 | 106 |
| 107 static void RegisterLocalStatePrefs(PrefRegistrySimple* registry); | 107 static void RegisterLocalStatePrefs(PrefRegistrySimple* registry); |
| 108 static void RegisterProfilePrefs(PrefRegistrySimple* registry); | 108 static void RegisterProfilePrefs(PrefRegistrySimple* registry); |
| 109 | 109 |
| 110 // Returns whether the Consolidated startup flow will be used, based on the |
| 111 // platform-appropriate Feature. |
| 112 // TODO(tmartino): Remove once this is on 100%. |
| 113 static bool UseConsolidatedFlow(); |
| 114 |
| 110 private: | 115 private: |
| 111 friend class CloudPrintProxyPolicyTest; | 116 friend class CloudPrintProxyPolicyTest; |
| 112 friend class CloudPrintProxyPolicyStartupTest; | 117 friend class CloudPrintProxyPolicyStartupTest; |
| 113 friend class StartupBrowserCreatorImpl; | 118 friend class StartupBrowserCreatorImpl; |
| 114 // TODO(crbug.com/642442): Remove this when first_run_tabs gets refactored. | 119 // TODO(crbug.com/642442): Remove this when first_run_tabs gets refactored. |
| 115 friend class StartupTabProviderImpl; | 120 friend class StartupTabProviderImpl; |
| 116 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 121 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
| 117 ReadingWasRestartedAfterNormalStart); | 122 ReadingWasRestartedAfterNormalStart); |
| 118 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, | 123 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, |
| 119 ReadingWasRestartedAfterRestart); | 124 ReadingWasRestartedAfterRestart); |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 const base::CommandLine& command_line); | 200 const base::CommandLine& command_line); |
| 196 | 201 |
| 197 // Returns the profile that should be loaded on process startup when | 202 // Returns the profile that should be loaded on process startup when |
| 198 // GetStartupProfile() returns null. As with GetStartupProfile(), returning the | 203 // GetStartupProfile() returns null. As with GetStartupProfile(), returning the |
| 199 // guest profile means the caller should open the user manager. This may return | 204 // guest profile means the caller should open the user manager. This may return |
| 200 // null if neither any profile nor the user manager can be opened. | 205 // null if neither any profile nor the user manager can be opened. |
| 201 Profile* GetFallbackStartupProfile(); | 206 Profile* GetFallbackStartupProfile(); |
| 202 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 207 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| 203 | 208 |
| 204 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ | 209 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ |
| OLD | NEW |