diff options
| author | kulkarni.a <kulkarni.a@samsung.com> | 2014-09-20 06:19:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-20 13:19:51 +0000 |
| commit | 933aeaf09f92c177ee5f172724f8c1955467ef0e (patch) | |
| tree | a87a7b87f13a3da0713451d70e7fc08761936e9c /remoting/host/client_session.h | |
| parent | 511484beb31286cb7e83d4305da8d16dd54d01aa (diff) | |
| download | chromium_src-933aeaf09f92c177ee5f172724f8c1955467ef0e.zip chromium_src-933aeaf09f92c177ee5f172724f8c1955467ef0e.tar.gz chromium_src-933aeaf09f92c177ee5f172724f8c1955467ef0e.tar.bz2 | |
Maintaining the proper order of initialization WeakPtrFactory in "src/remoting"
Changing in the intialization order of WeakPtrFactory in "src/remoting" module
such that all member variables should appear before the WeakPtrFactory
to ensure that any WeakPtrs to Controller are invalidated before its members
variable's destructors are executed, rendering them invalid.
BUG=303818
Review URL: https://codereview.chromium.org/569593002
Cr-Commit-Position: refs/heads/master@{#295868}
Diffstat (limited to 'remoting/host/client_session.h')
| -rw-r--r-- | remoting/host/client_session.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index f9fdd3b..6b4d0f7 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -173,10 +173,6 @@ class ClientSession std::string client_jid_; - // Used to disable callbacks to |this| once DisconnectSession() has been - // called. - base::WeakPtrFactory<ClientSessionControl> control_factory_; - // Used to create a DesktopEnvironment instance for this session. DesktopEnvironmentFactory* desktop_environment_factory_; @@ -263,6 +259,10 @@ class ClientSession bool lossless_video_encode_; bool lossless_video_color_; + // Used to disable callbacks to |this| once DisconnectSession() has been + // called. + base::WeakPtrFactory<ClientSessionControl> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(ClientSession); }; |