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

Side by Side Diff: content/browser/shared_worker/shared_worker_host.h

Issue 598483002: Fix WeakPtrFactory member ordering in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed order of friend class Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_ 5 #ifndef CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_
6 #define CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_ 6 #define CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_
7 7
8 #include <list> 8 #include <list>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 void RemoveFilters(SharedWorkerMessageFilter* filter); 118 void RemoveFilters(SharedWorkerMessageFilter* filter);
119 bool HasFilter(SharedWorkerMessageFilter* filter, int route_id) const; 119 bool HasFilter(SharedWorkerMessageFilter* filter, int route_id) const;
120 void SetMessagePortID(SharedWorkerMessageFilter* filter, 120 void SetMessagePortID(SharedWorkerMessageFilter* filter,
121 int route_id, 121 int route_id,
122 int message_port_id); 122 int message_port_id);
123 void AllowFileSystemResponse(scoped_ptr<IPC::Message> reply_msg, 123 void AllowFileSystemResponse(scoped_ptr<IPC::Message> reply_msg,
124 bool allowed); 124 bool allowed);
125 scoped_ptr<SharedWorkerInstance> instance_; 125 scoped_ptr<SharedWorkerInstance> instance_;
126 scoped_refptr<WorkerDocumentSet> worker_document_set_; 126 scoped_refptr<WorkerDocumentSet> worker_document_set_;
127 base::WeakPtrFactory<SharedWorkerHost> weak_factory_;
128 FilterList filters_; 127 FilterList filters_;
129 SharedWorkerMessageFilter* container_render_filter_; 128 SharedWorkerMessageFilter* container_render_filter_;
130 int worker_process_id_; 129 int worker_process_id_;
131 int worker_route_id_; 130 int worker_route_id_;
132 bool load_failed_; 131 bool load_failed_;
133 bool closed_; 132 bool closed_;
134 const base::TimeTicks creation_time_; 133 const base::TimeTicks creation_time_;
134
135 base::WeakPtrFactory<SharedWorkerHost> weak_factory_;
136
135 DISALLOW_COPY_AND_ASSIGN(SharedWorkerHost); 137 DISALLOW_COPY_AND_ASSIGN(SharedWorkerHost);
136 }; 138 };
137 } // namespace content 139 } // namespace content
138 140
139 #endif // CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_ 141 #endif // CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/browser/shared_worker/shared_worker_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698