Report text output and exit code for command-line operations.

chrome/browser/ui/startup/startup_browser_creator.h

 // Copyright (c) 2012 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_STARTUP_STARTUP_BROWSER_CREATOR_H_
 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/startup/startup_tab.h"
 #include "chrome/browser/ui/startup/startup_types.h"
 #include "googleurl/src/gurl.h"
 
 class Browser;
 class CommandLine;
 class GURL;
 class PrefService;
+class OperationOutput;
 
 // class containing helpers for BrowserMain to spin up a new instance and
 // initialize the profile.
 class StartupBrowserCreator {
  public:
   typedef std::vector<Profile*> Profiles;
 
   StartupBrowserCreator();
   ~StartupBrowserCreator();
 
   // Adds a url to be opened during first run. This overrides the standard
   // tabs shown at first run.
   void AddFirstRunTab(const GURL& url);
 
   // This function is equivalent to ProcessCommandLine but should only be
   // called during actual process startup.
+  // Returns true if the current process should continue running.
+  // |operation_output| will be notified of the outcome of the operation
+  // requested via cmd_line. If the process is to exit immediately, this will
+  // happen before Start() returns. Otherwise it may happen asynchronously.
   bool Start(const CommandLine& cmd_line,
              const base::FilePath& cur_dir,
              Profile* last_used_profile,
              const Profiles& last_opened_profiles,
-             int* return_code) {
-    return ProcessCmdLineImpl(cmd_line, cur_dir, true, last_used_profile,
-                              last_opened_profiles, return_code, this);
-  }
+             scoped_ptr<OperationOutput> operation_output);
 
   // 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.
   // |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 base::FilePath& cur_dir,
-      const base::FilePath& startup_profile_dir);
+      const base::FilePath& startup_profile_dir,
+      scoped_ptr<OperationOutput> operation_output);
 
   template <class AutomationProviderClass>
   static bool CreateAutomationProvider(const std::string& channel_id,
                                        Profile* profile,
                                        size_t expected_tabs);
 
   // Returns true if we're launching a profile synchronously. In that case, the
   // opened window should not cause a session restore.
   static bool InSynchronousProfileLaunch();
 
@@ skipping 53 matching lines @@
   static std::vector<GURL> GetURLsFromCommandLine(
       const CommandLine& command_line,
       const base::FilePath& cur_dir,
       Profile* profile);
 
   static bool ProcessCmdLineImpl(const CommandLine& command_line,
                                  const base::FilePath& cur_dir,
                                  bool process_startup,
                                  Profile* last_used_profile,
                                  const Profiles& last_opened_profiles,
-                                 int* return_code,
-                                 StartupBrowserCreator* browser_creator);
+                                 StartupBrowserCreator* browser_creator,
+                                 scoped_ptr<OperationOutput> operation_output);
 
   // Callback after a profile has been created.
   static void ProcessCommandLineOnProfileCreated(
       const CommandLine& command_line,
       const base::FilePath& cur_dir,
+      scoped_ptr<OperationOutput> operation_output,
       Profile* profile,
       Profile::CreateStatus status);
 
   // Returns true once a profile was activated. Used by the
   // StartupBrowserCreatorTest.LastUsedProfileActivated test.
   static bool ActivatedProfile();
 
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
@@ skipping 10 matching lines @@
   // member variable instead of a static variable inside WasRestarted because
   // of testing.)
   static bool was_restarted_read_;
 
   static bool in_synchronous_profile_launch_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreator);
 };
 
 #endif  // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_