summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_thread.cc
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 23:36:21 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 23:36:21 +0000
commit31f8713186cbb21398cd78c1de0db6a3789bb3ba (patch)
treeb6dc4fe37dd1f4e626276dbbdbfe63d2f1c1b059 /chrome/renderer/render_thread.cc
parent632be2f06943e1b6d68965bea0d14c403c7d61bb (diff)
downloadchromium_src-31f8713186cbb21398cd78c1de0db6a3789bb3ba.zip
chromium_src-31f8713186cbb21398cd78c1de0db6a3789bb3ba.tar.gz
chromium_src-31f8713186cbb21398cd78c1de0db6a3789bb3ba.tar.bz2
Make sure extensions work in single process mode.
BUG=42236 TEST=Start chrome with --single-process. Bookmark manager should still wok. Review URL: http://codereview.chromium.org/1704005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread.cc')
-rw-r--r--chrome/renderer/render_thread.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 8a527ca..38e068a 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -213,7 +213,9 @@ void RenderThread::Init() {
std::string type_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kProcessType);
- is_extension_process_ = type_str == switches::kExtensionProcess;
+ // In single process the single process is all there is.
+ is_extension_process_ = type_str == switches::kExtensionProcess ||
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
is_incognito_process_ = false;
suspend_webkit_shared_timer_ = true;
notify_webkit_of_modal_loop_ = true;