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

Unified Diff: remoting/host/it2me_desktop_environment.h

Issue 13461029: The continue window is owned by the desktop environment now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: remoting/host/it2me_desktop_environment.h
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/it2me_desktop_environment.h
similarity index 50%
copy from remoting/host/me2me_desktop_environment.h
copy to remoting/host/it2me_desktop_environment.h
index 5be25655b082dbe06acd01cc378100dcc1fcdeaa..09b21a927c2e96b457a6bc8621e5f3da280a8203 100644
--- a/remoting/host/me2me_desktop_environment.h
+++ b/remoting/host/it2me_desktop_environment.h
@@ -1,27 +1,27 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
-#ifndef REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
-#define REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
+#ifndef REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_
+#define REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "remoting/host/basic_desktop_environment.h"
namespace remoting {
-// Same as BasicDesktopEnvironment but supports desktop resizing and X DAMAGE
-// notifications on Linux.
-class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
- public:
- virtual ~Me2MeDesktopEnvironment();
+class HostWindow;
- // DesktopEnvironment interface.
- virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
- virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
+// Same as BasicDesktopEnvironment but also presents the Continue window to
+// the local user.
+class It2MeDesktopEnvironment : public BasicDesktopEnvironment {
+ public:
+ virtual ~It2MeDesktopEnvironment();
protected:
- friend class Me2MeDesktopEnvironmentFactory;
- Me2MeDesktopEnvironment(
+ friend class It2MeDesktopEnvironmentFactory;
+ It2MeDesktopEnvironment(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
@@ -29,27 +29,30 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
const UiStrings* ui_strings);
private:
- DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment);
+ // Presents the continue window to the local user.
+ scoped_ptr<HostWindow> continue_window_;
+
+ DISALLOW_COPY_AND_ASSIGN(It2MeDesktopEnvironment);
};
-// Used to create |Me2MeDesktopEnvironment| instances.
-class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
+// Used to create |It2MeDesktopEnvironment| instances.
+class It2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
public:
- Me2MeDesktopEnvironmentFactory(
+ It2MeDesktopEnvironmentFactory(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
const UiStrings& ui_strings);
- virtual ~Me2MeDesktopEnvironmentFactory();
+ virtual ~It2MeDesktopEnvironmentFactory();
// DesktopEnvironmentFactory interface.
virtual scoped_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
private:
- DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory);
+ DISALLOW_COPY_AND_ASSIGN(It2MeDesktopEnvironmentFactory);
};
} // namespace remoting
-#endif // REMOTING_HOST_ME2ME_DESKTOP_ENVIRONMENT_H_
+#endif // REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_

Powered by Google App Engine
This is Rietveld 408576698