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

Side by Side Diff: chrome/common/service_process_util_win.cc

Issue 1109043003: Apply automated fixits for Chrome clang plugin to chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
« no previous file with comments | « chrome/common/multi_process_lock_win.cc ('k') | chrome/installer/gcapi/gcapi_last_run_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 : terminate_task_(terminate_task) { 55 : terminate_task_(terminate_task) {
56 } 56 }
57 void Start() { 57 void Start() {
58 base::string16 event_name = GetServiceProcessTerminateEventName(); 58 base::string16 event_name = GetServiceProcessTerminateEventName();
59 DCHECK(event_name.length() <= MAX_PATH); 59 DCHECK(event_name.length() <= MAX_PATH);
60 terminate_event_.Set(CreateEvent(NULL, TRUE, FALSE, event_name.c_str())); 60 terminate_event_.Set(CreateEvent(NULL, TRUE, FALSE, event_name.c_str()));
61 watcher_.StartWatching(terminate_event_.Get(), this); 61 watcher_.StartWatching(terminate_event_.Get(), this);
62 } 62 }
63 63
64 // base::ObjectWatcher::Delegate implementation. 64 // base::ObjectWatcher::Delegate implementation.
65 virtual void OnObjectSignaled(HANDLE object) { 65 void OnObjectSignaled(HANDLE object) override {
66 if (!terminate_task_.is_null()) { 66 if (!terminate_task_.is_null()) {
67 terminate_task_.Run(); 67 terminate_task_.Run();
68 terminate_task_.Reset(); 68 terminate_task_.Reset();
69 } 69 }
70 } 70 }
71 71
72 private: 72 private:
73 base::win::ScopedHandle terminate_event_; 73 base::win::ScopedHandle terminate_event_;
74 base::win::ObjectWatcher watcher_; 74 base::win::ObjectWatcher watcher_;
75 base::Closure terminate_task_; 75 base::Closure terminate_task_;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 HKEY_CURRENT_USER, 168 HKEY_CURRENT_USER,
169 base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey())); 169 base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
170 return base::win::RemoveCommandFromAutoRun( 170 return base::win::RemoveCommandFromAutoRun(
171 HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey())); 171 HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey()));
172 } 172 }
173 173
174 void ServiceProcessState::TearDownState() { 174 void ServiceProcessState::TearDownState() {
175 delete state_; 175 delete state_;
176 state_ = NULL; 176 state_ = NULL;
177 } 177 }
OLDNEW
« no previous file with comments | « chrome/common/multi_process_lock_win.cc ('k') | chrome/installer/gcapi/gcapi_last_run_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698