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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator.h

Issue 2164033002: Refactoring startup logic for upcoming FRE changes (non-Win 10). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Win build issue Created 4 years, 2 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
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 #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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 101
102 // For faking that no profiles have been launched yet. 102 // For faking that no profiles have been launched yet.
103 static void ClearLaunchedProfilesForTesting(); 103 static void ClearLaunchedProfilesForTesting();
104 104
105 static void RegisterLocalStatePrefs(PrefRegistrySimple* registry); 105 static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
106 106
107 private: 107 private:
108 friend class CloudPrintProxyPolicyTest; 108 friend class CloudPrintProxyPolicyTest;
109 friend class CloudPrintProxyPolicyStartupTest; 109 friend class CloudPrintProxyPolicyStartupTest;
110 friend class StartupBrowserCreatorImpl; 110 friend class StartupBrowserCreatorImpl;
111 // TODO(crbug/642442): Remove this when first_run_tabs gets refactored.
Peter Kasting 2016/09/29 07:23:33 Tiny nit: "crbug/" only works on corp. I tend to
112 friend class StartupTabProviderImpl;
111 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, 113 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
112 ReadingWasRestartedAfterNormalStart); 114 ReadingWasRestartedAfterNormalStart);
113 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, 115 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
114 ReadingWasRestartedAfterRestart); 116 ReadingWasRestartedAfterRestart);
115 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, UpdateWithTwoProfiles); 117 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, UpdateWithTwoProfiles);
116 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, LastUsedProfileActivated); 118 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, LastUsedProfileActivated);
117 119
118 bool ProcessCmdLineImpl(const base::CommandLine& command_line, 120 bool ProcessCmdLineImpl(const base::CommandLine& command_line,
119 const base::FilePath& cur_dir, 121 const base::FilePath& cur_dir,
120 bool process_startup, 122 bool process_startup,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 const base::CommandLine& command_line); 192 const base::CommandLine& command_line);
191 193
192 // Returns the profile that should be loaded on process startup when 194 // Returns the profile that should be loaded on process startup when
193 // GetStartupProfile() returns null. As with GetStartupProfile(), returning the 195 // GetStartupProfile() returns null. As with GetStartupProfile(), returning the
194 // guest profile means the caller should open the user manager. This may return 196 // guest profile means the caller should open the user manager. This may return
195 // null if neither any profile nor the user manager can be opened. 197 // null if neither any profile nor the user manager can be opened.
196 Profile* GetFallbackStartupProfile(); 198 Profile* GetFallbackStartupProfile();
197 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 199 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
198 200
199 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ 201 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698