Honor profile directory when creating new window in existing browser

chrome/browser/ui/browser_init.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_
 #define CHROME_BROWSER_UI_BROWSER_INIT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "chrome/browser/profiles/profile.h"
 #include "googleurl/src/gurl.h"
 
 class Browser;
 class CommandLine;
 class GURL;
-class Profile;
 class TabContentsWrapper;
 
 // class containing helpers for BrowserMain to spin up a new instance and
 // initialize the profile.
 class BrowserInit {
  public:
   enum IsProcessStartup {
     IS_NOT_PROCESS_STARTUP,
     IS_PROCESS_STARTUP
   };
@@ skipping 10 matching lines @@
   void AddFirstRunTab(const GURL& url);
 
   // This function is equivalent to ProcessCommandLine but should only be
   // called during actual process startup.
   bool Start(const CommandLine& cmd_line, const FilePath& cur_dir,
              Profile* profile, int* return_code) {
     return ProcessCmdLineImpl(cmd_line, cur_dir, true, profile, return_code,
                               this);
   }
 
-  // This function performs command-line handling and is invoked when process
-  // starts as well as when we get a start request from another process (via the
-  // WM_COPYDATA message). |command_line| holds the command line we need to
-  // process - either from this process or from some other one (if
-  // |process_startup| is true and we are being called from
-  // ProcessSingleton::OnCopyData).
-  static bool ProcessCommandLine(const CommandLine& cmd_line,
-                                 const FilePath& cur_dir, bool process_startup,
-                                 Profile* profile, int* return_code) {
-    return ProcessCmdLineImpl(cmd_line, cur_dir, process_startup, profile,
-                              return_code, NULL);
-  }
+  // 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);
 
   template <class AutomationProviderClass>
   static bool CreateAutomationProvider(const std::string& channel_id,
                                        Profile* profile,
                                        size_t expected_tabs);
 
   // Returns true if the browser is coming up.
   static bool InProcessStartup();
 
   // Launches a browser window associated with |profile|. |command_line| should
@@ skipping 167 matching lines @@
   static std::vector<GURL> GetURLsFromCommandLine(
       const CommandLine& command_line,
       const FilePath& cur_dir,
       Profile* profile);
 
   static bool ProcessCmdLineImpl(const CommandLine& command_line,
                                  const FilePath& cur_dir, bool process_startup,
                                  Profile* profile, int* return_code,
                                  BrowserInit* browser_init);
 
+  // Callback after a profile has been created.
+  static void ProcessCommandLineOnProfileCreated(
+      const CommandLine& cmd_line,
+      const FilePath& cur_dir,
+      Profile* profile,
+      Profile::CreateStatus status);
+
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_