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

Unified Diff: content/child/child_thread.h

Issue 32283003: Fix crash with IPC_MESSAGE_LOG_ENABLED when running in single-process mode or in-process-gpu. The … (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Remove the change to the DCHECK Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/child_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_thread.h
diff --git a/content/child/child_thread.h b/content/child/child_thread.h
index 94918febd1c0cb8d4b01ac9a4d17cc7638157560..3b45d70d511d27928d2bbcf2e819887cc0bbdb1d 100644
--- a/content/child/child_thread.h
+++ b/content/child/child_thread.h
@@ -49,7 +49,7 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
public:
// Creates the thread.
ChildThread();
- // Used for single-process mode.
+ // Used for single-process mode and for in process gpu mode.
explicit ChildThread(const std::string& channel_name);
// ChildProcess::main_thread() is reset after Shutdown(), and before the
// destructor, so any subsystem that relies on ChildProcess::main_thread()
@@ -211,6 +211,8 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
scoped_ptr<base::PowerMonitor> power_monitor_;
+ bool in_browser_process_;
+
DISALLOW_COPY_AND_ASSIGN(ChildThread);
};
« no previous file with comments | « no previous file | content/child/child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698