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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.h

Issue 253843005: Fix mojo startup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-enable tests on windows Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.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 CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 #endif 262 #endif
263 263
264 // The count of currently swapped out but pending RenderViews. We have 264 // The count of currently swapped out but pending RenderViews. We have
265 // started to swap these in, so the renderer process should not exit if 265 // started to swap these in, so the renderer process should not exit if
266 // this count is non-zero. 266 // this count is non-zero.
267 int32 pending_views_; 267 int32 pending_views_;
268 268
269 private: 269 private:
270 friend class VisitRelayingRenderProcessHost; 270 friend class VisitRelayingRenderProcessHost;
271 271
272 void MaybeActivateMojo();
273
272 // Creates and adds the IO thread message filters. 274 // Creates and adds the IO thread message filters.
273 void CreateMessageFilters(); 275 void CreateMessageFilters();
274 276
275 // Control message handlers. 277 // Control message handlers.
276 void OnShutdownRequest(); 278 void OnShutdownRequest();
277 void OnDumpHandlesDone(); 279 void OnDumpHandlesDone();
278 void SuddenTerminationChanged(bool enabled); 280 void SuddenTerminationChanged(bool enabled);
279 void OnUserMetricsRecordAction(const std::string& action); 281 void OnUserMetricsRecordAction(const std::string& action);
280 void OnSavedPageAsMHTML(int job_id, int64 mhtml_file_size); 282 void OnSavedPageAsMHTML(int job_id, int64 mhtml_file_size);
281 283
(...skipping 20 matching lines...) Expand all
302 304
303 virtual void OnGpuSwitching() OVERRIDE; 305 virtual void OnGpuSwitching() OVERRIDE;
304 306
305 #if defined(ENABLE_WEBRTC) 307 #if defined(ENABLE_WEBRTC)
306 // Sends |file_for_transit| to the render process. 308 // Sends |file_for_transit| to the render process.
307 void SendAecDumpFileToRenderer(IPC::PlatformFileForTransit file_for_transit); 309 void SendAecDumpFileToRenderer(IPC::PlatformFileForTransit file_for_transit);
308 void SendDisableAecDumpToRenderer(); 310 void SendDisableAecDumpToRenderer();
309 #endif 311 #endif
310 312
311 scoped_ptr<MojoApplicationHost> mojo_application_host_; 313 scoped_ptr<MojoApplicationHost> mojo_application_host_;
314 bool mojo_activation_required_;
312 315
313 // The registered IPC listener objects. When this list is empty, we should 316 // The registered IPC listener objects. When this list is empty, we should
314 // delete ourselves. 317 // delete ourselves.
315 IDMap<IPC::Listener> listeners_; 318 IDMap<IPC::Listener> listeners_;
316 319
317 // The count of currently visible widgets. Since the host can be a container 320 // The count of currently visible widgets. Since the host can be a container
318 // for multiple widgets, it uses this count to determine when it should be 321 // for multiple widgets, it uses this count to determine when it should be
319 // backgrounded. 322 // backgrounded.
320 int32 visible_widgets_; 323 int32 visible_widgets_;
321 324
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 base::TimeTicks survive_for_worker_start_time_; 427 base::TimeTicks survive_for_worker_start_time_;
425 428
426 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_; 429 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
427 430
428 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl); 431 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
429 }; 432 };
430 433
431 } // namespace content 434 } // namespace content
432 435
433 #endif // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ 436 #endif // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698