Move dependency on env_vars.h to breakpad client

chrome/app/chrome_breakpad_client.cc

 // Copyright 2013 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.
 
 #include "chrome/app/chrome_breakpad_client.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
+#include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
+#include "chrome/common/env_vars.h"
 
 #if defined(OS_WIN)
 #include "base/file_version_info.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
 #include "chrome/common/chrome_version_info_posix.h"
 #endif
 
 #if defined(OS_POSIX)
@@ skipping 46 matching lines @@
       *product_name = version_info->product_short_name();
     }
 
     *special_build = version_info->special_build();
   } else {
     // No version info found. Make up the values.
     *product_name = base::ASCIIToUTF16("Chrome");
     *version = base::ASCIIToUTF16("0.0.0.0-devel");
   }
 }
+
+bool ChromeBreakpadClient::ShouldShowRestartDialog(base::string16* title,
+                                                   base::string16* message,
+                                                   bool* is_rtl_locale) {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  if (!env->HasVar(env_vars::kShowRestart) ||
+      !env->HasVar(env_vars::kRestartInfo)) {

[marja, 2013/07/19 08:20:33]

Nit: no { } for one-line bodies, even if the "if" is several lines.

[jochen (gone - plz use gerrit), 2013/07/19 08:23:51]

where's that rule from?

[marja, 2013/07/19 08:31:56]

Hmmh! I might be misinformed! Atm the style guide says: "In general, curly
braces are not required for single-line statements, but they are allowed if you
like them."

But but.. has it always been like this? I've had reviewers comment several times
that I should remove the { } if the body is one line.

However, pls ignore the nit, it's wrong.

+    return false;
+  }
+
+  std::string restart_info;
+  env->GetVar(env_vars::kRestartInfo, &restart_info);
+
+  // The CHROME_RESTART var contains the dialog strings separated by '|'.
+  // See ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment()
+  // for details.
+  std::vector<std::string> dlg_strings;
+  base::SplitString(restart_info, '|', &dlg_strings);
+
+  if (dlg_strings.size() < 3)
+    return false;
+
+  *title = base::ASCIIToUTF16(dlg_strings[0]);
+  *message = base::ASCIIToUTF16(dlg_strings[0]);
+  *is_rtl_locale = dlg_strings[2] == env_vars::kRtlLocale;
+  return true;
+}
+
+bool ChromeBreakpadClient::AboutToRestart() {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  if (!env->HasVar(env_vars::kRestartInfo))
+    return false;
+
+  env->SetVar(env_vars::kShowRestart, "1");
+  return true;
+}
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
 void ChromeBreakpadClient::GetProductNameAndVersion(std::string* product_name,
                                                     std::string* version) {
   DCHECK(product_name);
   DCHECK(version);
 #if defined(OS_ANDROID)
   *product_name = "Chrome_Android";
 #elif defined(OS_CHROMEOS)
@@ skipping 27 matching lines @@
 #if defined(OS_POSIX)
 void ChromeBreakpadClient::SetDumpWithoutCrashingFunction(void (*function)()) {
   logging::SetDumpWithoutCrashingFunction(function);
 }
 #endif
 
 size_t ChromeBreakpadClient::RegisterCrashKeys() {
   return crash_keys::RegisterChromeCrashKeys();
 }
 
+bool ChromeBreakpadClient::IsRunningUnattended() {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  return env->HasVar(env_vars::kHeadless);
+}
+
 }  // namespace chrome