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

Unified Diff: chrome/common/child_thread.cc

Issue 155846: Fix single process mode and the unit_tests on Linux.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 | « chrome/common/child_thread.h ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/child_thread.cc
===================================================================
--- chrome/common/child_thread.cc (revision 21117)
+++ chrome/common/child_thread.cc (working copy)
@@ -14,13 +14,21 @@
#include "webkit/glue/webkit_glue.h"
-ChildThread::ChildThread()
- : check_with_browser_before_shutdown_(false),
- message_loop_(MessageLoop::current()) {
+ChildThread::ChildThread() {
channel_name_ = WideToASCII(
CommandLine::ForCurrentProcess()->GetSwitchValue(
switches::kProcessChannelID));
+ Init();
+}
+ChildThread::ChildThread(const std::string channel_name)
+ : channel_name_(channel_name) {
+ Init();
+}
+
+void ChildThread::Init() {
+ check_with_browser_before_shutdown_ = false;
+ message_loop_ = MessageLoop::current();
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) {
webkit_glue::SetUserAgent(WideToUTF8(
CommandLine::ForCurrentProcess()->GetSwitchValue(
« no previous file with comments | « chrome/common/child_thread.h ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698