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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator.h

Issue 11968034: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: git://nomatter.syd/chromium/src.git@master
Patch Set: respond to comments Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator.h
diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h
index edd3a4315aa2a7c90adc543301070e57dc527627..ca5693b64370412a464d21f50f73ea8d57cb3db7 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.h
+++ b/chrome/browser/ui/startup/startup_browser_creator.h
@@ -48,9 +48,15 @@ class StartupBrowserCreator {
// This function performs command-line handling and is invoked only after
// start up (for example when we get a start request for another process).
- // |command_line| holds the command line we need to process
- static void ProcessCommandLineAlreadyRunning(const CommandLine& cmd_line,
- const FilePath& cur_dir);
+ // |command_line| holds the command line we need to process.
+ // |cur_dir| is the current working directory that the original process was
+ // invoked from.
+ // |startup_profile_dir| is the directory that contains the profile that the
+ // command line arguments will be executed under.
+ static void ProcessCommandLineAlreadyRunning(
+ const CommandLine& command_line,
+ const FilePath& cur_dir,
+ const FilePath& startup_profile_dir);
template <class AutomationProviderClass>
static bool CreateAutomationProvider(const std::string& channel_id,
@@ -129,7 +135,7 @@ class StartupBrowserCreator {
// Callback after a profile has been created.
static void ProcessCommandLineOnProfileCreated(
- const CommandLine& cmd_line,
+ const CommandLine& command_line,
const FilePath& cur_dir,
Profile* profile,
Profile::CreateStatus status);

Powered by Google App Engine
This is Rietveld 408576698