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

Unified Diff: chrome/browser/background_mode_manager_win.cc

Issue 6090006: Regkey functions return error code instead of bool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/browser/background_mode_manager_win.cc
===================================================================
--- chrome/browser/background_mode_manager_win.cc (revision 71761)
+++ chrome/browser/background_mode_manager_win.cc (working copy)
@@ -38,8 +38,11 @@
kBackgroundModeRegistrySubkey, KEY_READ);
base::win::RegKey write_key(kBackgroundModeRegistryRootKey,
kBackgroundModeRegistrySubkey, KEY_WRITE);
- if (read_key.ValueExists(key_name) && !write_key.DeleteValue(key_name))
- NOTREACHED() << "Failed to deregister launch on login.";
+ if (read_key.ValueExists(key_name)) {
+ LONG result = write_key.DeleteValue(key_name);
+ DCHECK_EQ(ERROR_SUCCESS, result) <<
+ "Failed to deregister launch on login. error: " << result;
+ }
}
void EnableLaunchOnStartupTask::Run() {
@@ -56,13 +59,14 @@
std::wstring new_value = executable.value() + L" --no-startup-window";
if (read_key.ValueExists(key_name)) {
std::wstring current_value;
- if (read_key.ReadValue(key_name, &current_value) &&
+ if ((read_key.ReadValue(key_name, &current_value) == ERROR_SUCCESS) &&
(current_value == new_value)) {
return;
}
}
- if (!write_key.WriteValue(key_name, new_value.c_str()))
- NOTREACHED() << "Failed to register launch on login.";
+ LONG result = write_key.WriteValue(key_name, new_value.c_str());
+ DCHECK_EQ(ERROR_SUCCESS, result) <<
+ "Failed to register launch on login. error: " << result;
}
} // namespace
« no previous file with comments | « chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc ('k') | chrome/browser/enumerate_modules_model_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698