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

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

Issue 1477783004: Add a preference to control Windows desktop search redirection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile error. Created 5 years 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 private: 125 private:
126 friend class CloudPrintProxyPolicyTest; 126 friend class CloudPrintProxyPolicyTest;
127 friend class CloudPrintProxyPolicyStartupTest; 127 friend class CloudPrintProxyPolicyStartupTest;
128 friend class StartupBrowserCreatorImpl; 128 friend class StartupBrowserCreatorImpl;
129 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, 129 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
130 ReadingWasRestartedAfterNormalStart); 130 ReadingWasRestartedAfterNormalStart);
131 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, 131 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
132 ReadingWasRestartedAfterRestart); 132 ReadingWasRestartedAfterRestart);
133 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, UpdateWithTwoProfiles); 133 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, UpdateWithTwoProfiles);
134 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, LastUsedProfileActivated); 134 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, LastUsedProfileActivated);
135 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorWinTest,
136 GetURLsFromCommandLineWithDesktopSearchURL);
135 137
136 // Returns the list of URLs to open from the command line. The returned 138 // Returns the list of URLs to open from the command line. The returned
137 // vector is empty if the user didn't specify any URLs on the command line. 139 // vector is empty if the user didn't specify any URLs on the command line.
138 static std::vector<GURL> GetURLsFromCommandLine( 140 static std::vector<GURL> GetURLsFromCommandLine(
139 const base::CommandLine& command_line, 141 const base::CommandLine& command_line,
140 const base::FilePath& cur_dir, 142 const base::FilePath& cur_dir,
141 Profile* profile); 143 Profile* profile);
142 144
143 static bool ProcessCmdLineImpl(const base::CommandLine& command_line, 145 static bool ProcessCmdLineImpl(const base::CommandLine& command_line,
144 const base::FilePath& cur_dir, 146 const base::FilePath& cur_dir,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // Returns true if |profile| has exited uncleanly and has not been launched 195 // Returns true if |profile| has exited uncleanly and has not been launched
194 // after the unclean exit. 196 // after the unclean exit.
195 bool HasPendingUncleanExit(Profile* profile); 197 bool HasPendingUncleanExit(Profile* profile);
196 198
197 // Returns the path that contains the profile that should be loaded on process 199 // Returns the path that contains the profile that should be loaded on process
198 // startup. 200 // startup.
199 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir, 201 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
200 const base::CommandLine& command_line); 202 const base::CommandLine& command_line);
201 203
202 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_ 204 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_service_factory.cc ('k') | chrome/browser/ui/startup/startup_browser_creator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698