| Index: chrome/app/chrome_crash_reporter_client_win.cc
|
| diff --git a/chrome/app/chrome_crash_reporter_client_win.cc b/chrome/app/chrome_crash_reporter_client_win.cc
|
| index 874634d553002d6419ba13d27cf7f8c88cc2c8bd..045ac65b81751a7e22f6ca7cea55156e41782847 100644
|
| --- a/chrome/app/chrome_crash_reporter_client_win.cc
|
| +++ b/chrome/app/chrome_crash_reporter_client_win.cc
|
| @@ -17,7 +17,6 @@
|
| #include "base/debug/leak_annotations.h"
|
| #include "base/format_macros.h"
|
| #include "chrome/common/chrome_result_codes.h"
|
| -#include "chrome/install_static/install_details.h"
|
| #include "chrome/install_static/install_util.h"
|
| #include "components/crash/content/app/crashpad.h"
|
| #include "components/crash/core/common/crash_keys.h"
|
| @@ -317,20 +316,23 @@
|
| return false;
|
| }
|
|
|
| -// TODO(grt): Remove |exe_path| from crash_reporter::CrashReporterClient.
|
| bool ChromeCrashReporterClient::GetIsPerUserInstall(
|
| const base::string16& exe_path) {
|
| - return !install_static::InstallDetails::Get().system_level();
|
| -}
|
| -
|
| -// TODO(grt): Remove |is_per_user_install| from
|
| -// crash_reporter::CrashReporterClient.
|
| + return !install_static::IsSystemInstall(exe_path.c_str());
|
| +}
|
| +
|
| bool ChromeCrashReporterClient::GetShouldDumpLargerDumps(
|
| bool is_per_user_install) {
|
| - // Capture larger dumps for Google Chrome "beta", "dev", and "canary"
|
| - // channels. Stable channel and Chromium builds are on channel "", and use
|
| - // smaller dumps.
|
| - return !install_static::InstallDetails::Get().channel().empty();
|
| + base::string16 channel_name;
|
| + install_static::GetChromeChannelName(is_per_user_install,
|
| + false, // !add_modifier
|
| + &channel_name);
|
| + // Capture more detail in crash dumps for Beta, Dev, Canary channels and
|
| + // if channel is unknown (e.g. Chromium or developer builds).
|
| + return (channel_name == install_static::kChromeChannelBeta ||
|
| + channel_name == install_static::kChromeChannelDev ||
|
| + channel_name == install_static::kChromeChannelCanary ||
|
| + channel_name == install_static::kChromeChannelUnknown);
|
| }
|
|
|
| int ChromeCrashReporterClient::GetResultCodeRespawnFailed() {
|
|
|