| Index: remoting/host/resizing_host_observer.h
|
| diff --git a/remoting/host/resizing_host_observer.h b/remoting/host/resizing_host_observer.h
|
| index 1c23b7557eb20b6b499ea6b8516d1f3a341cda0c..85c23f1971d90ec278f52679faa1afb2ba08d47c 100644
|
| --- a/remoting/host/resizing_host_observer.h
|
| +++ b/remoting/host/resizing_host_observer.h
|
| @@ -7,23 +7,24 @@
|
|
|
| #include <string>
|
|
|
| -#include "remoting/host/host_status_observer.h"
|
| -#include "remoting/host/chromoting_host.h"
|
| -
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/memory/weak_ptr.h"
|
| +#include "remoting/host/host_status_observer.h"
|
| #include "third_party/skia/include/core/SkSize.h"
|
|
|
| namespace remoting {
|
|
|
| class DesktopResizer;
|
| +class HostStatusMonitor;
|
|
|
| // Use the specified DesktopResizer to match host desktop size to the client
|
| // view size as closely as is possible. When the connection closes, restore
|
| // the original desktop size.
|
| class ResizingHostObserver : public HostStatusObserver {
|
| public:
|
| - ResizingHostObserver(DesktopResizer* desktop_resizer, ChromotingHost* host);
|
| + ResizingHostObserver(DesktopResizer* desktop_resizer,
|
| + base::WeakPtr<HostStatusMonitor> monitor);
|
| virtual ~ResizingHostObserver();
|
|
|
| // HostStatusObserver interface
|
| @@ -35,7 +36,7 @@ class ResizingHostObserver : public HostStatusObserver {
|
|
|
| private:
|
| DesktopResizer* const desktop_resizer_;
|
| - scoped_refptr<ChromotingHost> host_;
|
| + base::WeakPtr<HostStatusMonitor> monitor_;
|
| SkISize original_size_;
|
| std::string client_jid_;
|
|
|
|
|