Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(645)

Unified Diff: chrome/app/chrome_crash_reporter_client_win.cc

Issue 2422643002: Windows install_static refactor. (Closed)
Patch Set: maybe fix nacl64 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 139a0ed4f3ee7970d9c2127b95a799a9ba6411be..4673d54f68681c77c34b7c42c55b68b7b1550e9e 100644
--- a/chrome/app/chrome_crash_reporter_client_win.cc
+++ b/chrome/app/chrome_crash_reporter_client_win.cc
@@ -17,6 +17,7 @@
#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"
@@ -307,23 +308,21 @@ bool ChromeCrashReporterClient::GetDeferredUploadsSupported(
return false;
}
+// TODO(grt): Remove |exe_path| from crash_reporter::CrashReporterClient.
bool ChromeCrashReporterClient::GetIsPerUserInstall(
const base::string16& exe_path) {
- return !install_static::IsSystemInstall(exe_path.c_str());
+ return !install_static::InstallDetails::Get().system_level();
}
+// TODO(grt): Remove |is_per_user_install| from
+// crash_reporter::CrashReporterClient.
robertshield 2016/10/24 13:56:21 Consider sticking these TODOs on CrashReporterClie
grt (UTC plus 2) 2016/10/24 19:36:00 I was trying to keep the size of the CL in check b
robertshield 2016/10/28 06:56:52 Oh, sure, that's fine too since the winds of chang
grt (UTC plus 2) 2016/10/28 10:59:44 Will do. I plan for the next CL to be the one that
bool ChromeCrashReporterClient::GetShouldDumpLargerDumps(
bool is_per_user_install) {
- 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);
+ // Capture larger dumps for:
+ // - Chromium builds: "unknown" channel
+ // - Google Chrome builds: "beta", "dev", and "canary" channels.
+ // That leaves stable channel, which is the empty string.
+ return !install_static::InstallDetails::Get().channel().empty();
}
int ChromeCrashReporterClient::GetResultCodeRespawnFailed() {

Powered by Google App Engine
This is Rietveld 408576698