Register Application Restart with Windows Restart Manager

base/command_line.cc

Index: base/command_line.cc
diff --git a/base/command_line.cc b/base/command_line.cc
index 66b4437dcf171c62d86257de04b2c3996923f620..c107675bd8872d9f9b0b3d356d8c4d570524074c 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -41,6 +41,7 @@ const char kSwitchValueSeparator[] = "=";
 #endif
 
 #if defined(OS_WIN)
+namespace {

[Evan Martin, 2011/02/10 19:38:31]

Thanks for the cleanup!  Can you remove the "static" qualifiers on the functions
in this anon namespace?

[msw, 2011/02/10 19:54:54]

Done.

 // Lowercase a string.  This is used to lowercase switch names.
 // Is this what we really want?  It seems crazy to me.  I've left it in
 // for backwards compatibility on Windows.
@@ -48,6 +49,51 @@ static void Lowercase(std::string* parameter) {
   transform(parameter->begin(), parameter->end(), parameter->begin(),
             tolower);
 }
+
+// Quote a string if necessary, such that CommandLineToArgvW() will
+// always process it as a single argument.
+static std::wstring WindowsStyleQuote(const std::wstring& arg) {
+  // We follow the quoting rules of CommandLineToArgvW.
+  // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
+  if (arg.find_first_of(L" \\\"") == std::wstring::npos) {
+    // No quoting necessary.
+    return arg;
+  }
+
+  std::wstring out;
+  out.push_back(L'"');
+  for (size_t i = 0; i < arg.size(); ++i) {
+    if (arg[i] == '\\') {
+      // Find the extent of this run of backslashes.
+      size_t start = i, end = start + 1;
+      for (; end < arg.size() && arg[end] == '\\'; ++end)
+        /* empty */;
+      size_t backslash_count = end - start;
+
+      // Backslashes are escapes only if the run is followed by a double quote.
+      // Since we also will end the string with a double quote, we escape for
+      // either a double quote or the end of the string.
+      if (end == arg.size() || arg[end] == '"') {
+        // To quote, we need to output 2x as many backslashes.
+        backslash_count *= 2;
+      }
+      for (size_t j = 0; j < backslash_count; ++j)
+        out.push_back('\\');
+
+      // Advance i to one before the end to balance i++ in loop.
+      i = end - 1;
+    } else if (arg[i] == '"') {
+      out.push_back('\\');
+      out.push_back('"');
+    } else {
+      out.push_back(arg[i]);
+    }
+  }
+  out.push_back('"');
+
+  return out;
+}
+}  // namespace
 #endif
 
 CommandLine::~CommandLine() {
@@ -291,55 +337,6 @@ void CommandLine::AppendSwitch(const std::string& switch_string) {
   switches_[switch_string] = L"";
 }
 
-void CommandLine::AppendSwitchASCII(const std::string& switch_string,
-                                    const std::string& value_string) {
-  AppendSwitchNative(switch_string, ASCIIToWide(value_string));
-}
-
-// Quote a string if necessary, such that CommandLineToArgvW() will
-// always process it as a single argument.
-static std::wstring WindowsStyleQuote(const std::wstring& arg) {
-  // We follow the quoting rules of CommandLineToArgvW.
-  // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
-  if (arg.find_first_of(L" \\\"") == std::wstring::npos) {
-    // No quoting necessary.
-    return arg;
-  }
-
-  std::wstring out;
-  out.push_back(L'"');
-  for (size_t i = 0; i < arg.size(); ++i) {
-    if (arg[i] == '\\') {
-      // Find the extent of this run of backslashes.
-      size_t start = i, end = start + 1;
-      for (; end < arg.size() && arg[end] == '\\'; ++end)
-        /* empty */;
-      size_t backslash_count = end - start;
-
-      // Backslashes are escapes only if the run is followed by a double quote.
-      // Since we also will end the string with a double quote, we escape for
-      // either a double quote or the end of the string.
-      if (end == arg.size() || arg[end] == '"') {
-        // To quote, we need to output 2x as many backslashes.
-        backslash_count *= 2;
-      }
-      for (size_t j = 0; j < backslash_count; ++j)
-        out.push_back('\\');
-
-      // Advance i to one before the end to balance i++ in loop.
-      i = end - 1;
-    } else if (arg[i] == '"') {
-      out.push_back('\\');
-      out.push_back('"');
-    } else {
-      out.push_back(arg[i]);
-    }
-  }
-  out.push_back('"');
-
-  return out;
-}
-
 void CommandLine::AppendSwitchNative(const std::string& switch_string,
                                      const std::wstring& value) {
   std::wstring combined_switch_string =
@@ -353,6 +350,11 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string,
   switches_[switch_string] = value;
 }
 
+void CommandLine::AppendSwitchASCII(const std::string& switch_string,
+                                    const std::string& value_string) {
+  AppendSwitchNative(switch_string, ASCIIToWide(value_string));
+}
+
 void CommandLine::AppendArg(const std::string& value) {
   DCHECK(IsStringUTF8(value));
   AppendArgNative(UTF8ToWide(value));
@@ -367,8 +369,7 @@ void CommandLine::AppendArgNative(const std::wstring& value) {
 void CommandLine::AppendArguments(const CommandLine& other,
                                   bool include_program) {
   // Verify include_program is used correctly.
-  // Logic could be shorter but this is clearer.
-  DCHECK_EQ(include_program, !other.GetProgram().empty());
+  DCHECK(!include_program || !other.GetProgram().empty());
   if (include_program)
     program_ = other.program_;
 
@@ -451,13 +452,31 @@ void CommandLine::PrependWrapper(const std::string& wrapper) {
 
 #endif
 
+void CommandLine::AppendSwitchPath(const std::string& switch_string,
+                                   const FilePath& path) {
+  AppendSwitchNative(switch_string, path.value());
+}
+
+void CommandLine::AppendSwitches(const CommandLine& other) {
+  std::map<std::string, StringType>::const_iterator i;
+  for (i = other.switches_.begin(); i != other.switches_.end(); ++i)
+    AppendSwitchNative(i->first, i->second);
+}
+
 void CommandLine::AppendArgPath(const FilePath& path) {
   AppendArgNative(path.value());
 }
 
-void CommandLine::AppendSwitchPath(const std::string& switch_string,
-                                   const FilePath& path) {
-  AppendSwitchNative(switch_string, path.value());
+void CommandLine::AppendArgs(const CommandLine& other) {
+  if(other.args_.size() <= 0)
+    return;
+
+#if defined(OS_WIN)
+  command_line_string_.append(L" --");

[Evan Martin, 2011/02/10 19:38:31]

This makes me anxious.  Does this mean we do the wrong thing if you mix calls to
AppendArgs and other calls?

I had always intended to remove command_line_string_ and instead generate it on
the fly from the args_ array to avoid these kinds of issues, but I never got
around to it...

[msw, 2011/02/10 19:54:54]

That's an excellent point, appending switches after args would break the
switches. There's a *lot* of room for improvement in this code. I will create a
new issue and tackle this prerequisite functionality asap.

[msw, 2011/02/16 23:15:53]

I added a comment above the AppendSwitch* declarations for now. I'll follow up
on the extensive amount of needed CommandLine cleanup work with Issue 73195;
this should suffice in the mean time. Please let me know if you disagree.

+#endif  // OS_WIN
+  std::vector<StringType>::const_iterator i;
+  for (i = other.args_.begin(); i != other.args_.end(); ++i)
+    AppendArgNative(*i);
 }
 
 void CommandLine::CopySwitchesFrom(const CommandLine& source,