Re-doing previous patch.

Curiously, the header that was missing (causing this redo) now appears to be part of the checked-in file.

BUG=73759
TEST=manual

Review URL: http://codereview.chromium.org/6635030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77335 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/background_mode_manager_linux.cc b/chrome/browser/background_mode_manager_linux.cc
index be4d969..b172633 100644
--- a/chrome/browser/background_mode_manager_linux.cc
+++ b/chrome/browser/background_mode_manager_linux.cc
@@ -67,8 +67,8 @@ void EnableLaunchOnStartupTask::Run() {
         << "Failed to register launch on login.  CHROME_WRAPPER not set.";
     return;
   }
-  std::string command_line =
-      wrapper_script + " --no-startup-window";
+  std::string command_line = wrapper_script +
+      " --" + switches::kNoStartupWindow;
   if (!AutoStart::AddApplication(
           ShellIntegration::GetDesktopName(environment.get()),
           version_info->Name(),
diff --git a/chrome/browser/background_mode_manager_win.cc b/chrome/browser/background_mode_manager_win.cc
index 7eafe73..9be2219 100644
--- a/chrome/browser/background_mode_manager_win.cc
+++ b/chrome/browser/background_mode_manager_win.cc
@@ -14,7 +14,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"

+#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ -58,7 +58,8 @@ void EnableLaunchOnStartupTask::Run() {
   FilePath executable;
   if (!PathService::Get(base::FILE_EXE, &executable))
     return;
-  std::wstring new_value = executable.value() + L" --no-startup-window";
+  std::wstring new_value = executable.value() +
+      L" --" + ASCIIToUTF16(switches::kNoStartupWindow);
   if (read_key.ValueExists(key_name)) {
     std::wstring current_value;
     if ((read_key.ReadValue(key_name, &current_value) == ERROR_SUCCESS) &&