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

Unified Diff: ceee/common/process_utils_win.cc

Issue 6126002: Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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: ceee/common/process_utils_win.cc
diff --git a/ceee/common/process_utils_win.cc b/ceee/common/process_utils_win.cc
index 80df82159087e29a25b82710e66431acff1a7b9b..239bbfe39661606da8b8dcfb72a2d970f7711112 100644
--- a/ceee/common/process_utils_win.cc
+++ b/ceee/common/process_utils_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -9,24 +9,23 @@
#include <sddl.h>
#include "base/logging.h"
-#include "base/scoped_handle.h"
+#include "base/win/scoped_handle.h"
#include "base/win/windows_version.h"
#include "ceee/common/com_utils.h"
-
namespace process_utils_win {
HRESULT SetThreadIntegrityLevel(HANDLE* thread, const std::wstring& level) {
HANDLE temp_handle = NULL;
BOOL success = ::OpenProcessToken(
::GetCurrentProcess(), MAXIMUM_ALLOWED, &temp_handle);
- ScopedHandle process_token(temp_handle);
+ base::win::ScopedHandle process_token(temp_handle);
temp_handle = NULL;
if (success) {
success = ::DuplicateTokenEx(
process_token, MAXIMUM_ALLOWED, NULL, SecurityImpersonation,
TokenImpersonation, &temp_handle);
- ScopedHandle mic_token(temp_handle);
+ base::win::ScopedHandle mic_token(temp_handle);
temp_handle = NULL;
if (success) {
PSID mic_sid = NULL;
@@ -98,7 +97,7 @@ HRESULT IsCurrentProcessUacElevated(bool* running_as_admin) {
// All that for an admin-group member, who can run in elevated mode.
// This logic applies to Vista/Win7. The case of earlier systems is handled
// at the start.
- ScopedHandle process_token(temp_handle);
+ base::win::ScopedHandle process_token(temp_handle);
TOKEN_ELEVATION_TYPE elevation_type = TokenElevationTypeDefault;
DWORD variable_len_dummy = 0;
if (!::GetTokenInformation(process_token, TokenElevationType, &elevation_type,
@@ -331,4 +330,4 @@ void ProcessCompatibilityCheck::ResetState() {
GetInstance()->StandardInitialize();
}
-} // namespace com
+} // namespace process_utils_win

Powered by Google App Engine
This is Rietveld 408576698