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

Unified Diff: remoting/host/setup/daemon_controller_delegate_win.h

Issue 877343004: Move the |ElevatedDaemonController| implementation to |DaemonControllerDelegateWin| (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: remoting/host/setup/daemon_controller_delegate_win.h
diff --git a/remoting/host/setup/daemon_controller_delegate_win.h b/remoting/host/setup/daemon_controller_delegate_win.h
index 29ad739fb96c6f2f63de1e2bb8a1f8e65de53287..91a4787b2ef541a9bae3258adb4f1526b6f76185 100644
--- a/remoting/host/setup/daemon_controller_delegate_win.h
+++ b/remoting/host/setup/daemon_controller_delegate_win.h
@@ -5,11 +5,7 @@
#ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_WIN_H_
#define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_WIN_H_
-#include "base/memory/scoped_ptr.h"
-#include "base/timer/timer.h"
#include "base/win/scoped_comptr.h"
-// chromoting_lib.h contains MIDL-generated declarations.
-#include "remoting/host/chromoting_lib.h"
#include "remoting/host/setup/daemon_controller.h"
namespace remoting {
@@ -36,33 +32,6 @@ class DaemonControllerDelegateWin : public DaemonController::Delegate {
virtual std::string GetVersion() override;
virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
- private:
- // Activates an unprivileged instance of the daemon controller and caches it.
- HRESULT ActivateController();
-
- // Activates an instance of the daemon controller and caches it. If COM
- // Elevation is supported (Vista+) the activated instance is elevated,
- // otherwise it is activated under credentials of the caller.
- HRESULT ActivateElevatedController();
-
- // Releases the cached instance of the controller.
- void ReleaseController();
-
- // |control_| and |control2_| hold references to an instance of the daemon
- // controller to prevent a UAC prompt on every operation.
- base::win::ScopedComPtr<IDaemonControl> control_;
- base::win::ScopedComPtr<IDaemonControl2> control2_;
-
- // True if |control_| holds a reference to an elevated instance of the daemon
- // controller.
- bool control_is_elevated_;
-
- // This timer is used to release |control_| after a timeout.
- scoped_ptr<base::OneShotTimer<DaemonControllerDelegateWin> > release_timer_;
-
- // Handle of the plugin window.
- HWND window_handle_;
-
DISALLOW_COPY_AND_ASSIGN(DaemonControllerDelegateWin);
};

Powered by Google App Engine
This is Rietveld 408576698