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

Side by Side Diff: remoting/host/ipc_desktop_environment.h

Issue 551393003: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating files Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | remoting/host/ipc_desktop_environment.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // True if curtain mode is enabled. 121 // True if curtain mode is enabled.
122 bool curtain_enabled_; 122 bool curtain_enabled_;
123 123
124 // IPC channel connected to the daemon process. 124 // IPC channel connected to the daemon process.
125 IPC::Sender* daemon_channel_; 125 IPC::Sender* daemon_channel_;
126 126
127 // List of DesktopEnvironment instances we've told the daemon process about. 127 // List of DesktopEnvironment instances we've told the daemon process about.
128 typedef std::map<int, DesktopSessionProxy*> ActiveConnectionsList; 128 typedef std::map<int, DesktopSessionProxy*> ActiveConnectionsList;
129 ActiveConnectionsList active_connections_; 129 ActiveConnectionsList active_connections_;
130 130
131 // Factory for weak pointers to DesktopSessionConnector interface.
132 base::WeakPtrFactory<DesktopSessionConnector> connector_factory_;
133
134 // Next desktop session ID. IDs are allocated sequentially starting from 0. 131 // Next desktop session ID. IDs are allocated sequentially starting from 0.
135 // This gives us more than 67 years of unique IDs assuming a new ID is 132 // This gives us more than 67 years of unique IDs assuming a new ID is
136 // allocated every second. 133 // allocated every second.
137 int next_id_; 134 int next_id_;
138 135
136 // Factory for weak pointers to DesktopSessionConnector interface.
137 base::WeakPtrFactory<DesktopSessionConnector> connector_factory_;
138
139 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory); 139 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory);
140 }; 140 };
141 141
142 } // namespace remoting 142 } // namespace remoting
143 143
144 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 144 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/ipc_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698