Chromium Code Reviews| Index: chrome/browser/background_mode_manager_win.cc |
| =================================================================== |
| --- chrome/browser/background_mode_manager_win.cc (revision 70414) |
| +++ 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); |
| + if (result != ERROR_SUCCESS) |
|
grt (UTC plus 2)
2011/01/11 03:51:30
DCHECK_EQ(ERROR_SUCCESS, result) << "Failed..." <<
amit
2011/01/12 04:11:23
Done.
|
| + NOTREACHED() << "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, ¤t_value) && |
| + if ((read_key.ReadValue(key_name, ¤t_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()); |
| + if (result != ERROR_SUCCESS) |
|
grt (UTC plus 2)
2011/01/11 03:51:30
DCHECK_EQ as above
amit
2011/01/12 04:11:23
Done.
|
| + NOTREACHED() << "Failed to register launch on login. Error: " << result; |
| } |
| } // namespace |