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

Unified Diff: remoting/host/desktop_session_agent.h

Issue 13212009: Made DesktopEnvironment responsible for creation of the disconnect window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Mac Created 7 years, 9 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
« no previous file with comments | « remoting/host/desktop_process_unittest.cc ('k') | remoting/host/desktop_session_agent.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_agent.h
diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h
index 9f8c905c22e7c32af1f9ab569e4e7ac834d382fa..b213809b5d1b4936f52da93e922a26e9c4c5941e 100644
--- a/remoting/host/desktop_session_agent.h
+++ b/remoting/host/desktop_session_agent.h
@@ -18,7 +18,6 @@
#include "media/video/capture/screen/screen_capturer.h"
#include "media/video/capture/screen/shared_buffer.h"
#include "remoting/host/client_session_control.h"
-#include "remoting/host/ui_strings.h"
#include "remoting/protocol/clipboard_stub.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkSize.h"
@@ -35,7 +34,6 @@ class AudioPacket;
class AutoThreadTaskRunner;
class DesktopEnvironment;
class DesktopEnvironmentFactory;
-class DisconnectWindow;
class InputInjector;
class RemoteInputFilter;
class ScreenControls;
@@ -221,9 +219,6 @@ class DesktopSessionAgent
// The DesktopEnvironment instance used by this agent.
scoped_ptr<DesktopEnvironment> desktop_environment_;
- // Provides a user interface allowing the local user to close the connection.
- scoped_ptr<DisconnectWindow> disconnect_window_;
-
// Executes keyboard, mouse and clipboard events.
scoped_ptr<InputInjector> input_injector_;
@@ -259,8 +254,6 @@ class DesktopSessionAgent
// Captures the screen.
scoped_ptr<media::ScreenCapturer> video_capturer_;
- UiStrings ui_strings_;
-
DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
};
« no previous file with comments | « remoting/host/desktop_process_unittest.cc ('k') | remoting/host/desktop_session_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698