| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/app/chrome_breakpad_client.h" | 5 #include "chrome/app/chrome_breakpad_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/environment.h" | 8 #include "base/environment.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 GoogleUpdateSettings::GetChromeChannelAndModifiers( | 112 GoogleUpdateSettings::GetChromeChannelAndModifiers( |
| 113 !GetIsPerUserInstall(exe_path), &channel_string); | 113 !GetIsPerUserInstall(exe_path), &channel_string); |
| 114 *channel_name = base::WideToUTF16(channel_string); | 114 *channel_name = base::WideToUTF16(channel_string); |
| 115 } | 115 } |
| 116 | 116 |
| 117 bool ChromeBreakpadClient::ShouldShowRestartDialog(base::string16* title, | 117 bool ChromeBreakpadClient::ShouldShowRestartDialog(base::string16* title, |
| 118 base::string16* message, | 118 base::string16* message, |
| 119 bool* is_rtl_locale) { | 119 bool* is_rtl_locale) { |
| 120 scoped_ptr<base::Environment> env(base::Environment::Create()); | 120 scoped_ptr<base::Environment> env(base::Environment::Create()); |
| 121 if (!env->HasVar(env_vars::kShowRestart) || | 121 if (!env->HasVar(env_vars::kShowRestart) || |
| 122 !env->HasVar(env_vars::kRestartInfo)) { | 122 !env->HasVar(env_vars::kRestartInfo) || |
| 123 env->HasVar(env_vars::kMetroConnected)) { |
| 123 return false; | 124 return false; |
| 124 } | 125 } |
| 125 | 126 |
| 126 std::string restart_info; | 127 std::string restart_info; |
| 127 env->GetVar(env_vars::kRestartInfo, &restart_info); | 128 env->GetVar(env_vars::kRestartInfo, &restart_info); |
| 128 | 129 |
| 129 // The CHROME_RESTART var contains the dialog strings separated by '|'. | 130 // The CHROME_RESTART var contains the dialog strings separated by '|'. |
| 130 // See ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment() | 131 // See ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment() |
| 131 // for details. | 132 // for details. |
| 132 std::vector<std::string> dlg_strings; | 133 std::vector<std::string> dlg_strings; |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 } | 252 } |
| 252 #endif | 253 #endif |
| 253 | 254 |
| 254 #if defined(OS_ANDROID) | 255 #if defined(OS_ANDROID) |
| 255 int ChromeBreakpadClient::GetAndroidMinidumpDescriptor() { | 256 int ChromeBreakpadClient::GetAndroidMinidumpDescriptor() { |
| 256 return kAndroidMinidumpDescriptor; | 257 return kAndroidMinidumpDescriptor; |
| 257 } | 258 } |
| 258 #endif | 259 #endif |
| 259 | 260 |
| 260 } // namespace chrome | 261 } // namespace chrome |
| OLD | NEW |