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

Unified Diff: chrome/app/chrome_crash_reporter_client_win.cc

Issue 2422643002: Windows install_static refactor. (Closed)
Patch Set: sync to position 431863 Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/app/chrome_exe_main_win.cc » ('j') | chrome/install_static/chromium_install_modes.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f843891c2983b03a6a4d30931ad5c355356297bd..1b3607019d66a4d61cab82008c02b242e64b77fe 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"
@@ -323,23 +324,20 @@ 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.
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 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();
}
int ChromeCrashReporterClient::GetResultCodeRespawnFailed() {
« no previous file with comments | « no previous file | chrome/app/chrome_exe_main_win.cc » ('j') | chrome/install_static/chromium_install_modes.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698