| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/service_process_util.h" | 5 #include "chrome/common/service_process_util.h" |
| 6 | 6 |
| 7 #include <algorithm> |
| 7 #include <memory> | 8 #include <memory> |
| 8 | 9 |
| 9 #include "base/callback.h" | 10 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 11 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
| 12 #include "base/logging.h" | 13 #include "base/logging.h" |
| 13 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 14 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
| 16 #include "base/win/object_watcher.h" | 17 #include "base/win/object_watcher.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 HKEY_CURRENT_USER, | 169 HKEY_CURRENT_USER, |
| 169 base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey())); | 170 base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey())); |
| 170 return base::win::RemoveCommandFromAutoRun( | 171 return base::win::RemoveCommandFromAutoRun( |
| 171 HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey())); | 172 HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey())); |
| 172 } | 173 } |
| 173 | 174 |
| 174 void ServiceProcessState::TearDownState() { | 175 void ServiceProcessState::TearDownState() { |
| 175 delete state_; | 176 delete state_; |
| 176 state_ = NULL; | 177 state_ = NULL; |
| 177 } | 178 } |
| OLD | NEW |