diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 05:21:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 05:21:17 +0000 |
| commit | 3cb054e682096bb5596ca0403d7fed2548c83f2c (patch) | |
| tree | 9b4ab6b05693db127ef8c51baf7e951551f9e1b8 /content/browser/utility_process_host.cc | |
| parent | 394184966eb9ce9a18d019cca3d308ec7e18f78d (diff) | |
| download | chromium_src-3cb054e682096bb5596ca0403d7fed2548c83f2c.zip chromium_src-3cb054e682096bb5596ca0403d7fed2548c83f2c.tar.gz chromium_src-3cb054e682096bb5596ca0403d7fed2548c83f2c.tar.bz2 | |
Remove g_browser_process dependency from content. Also make all the SyncChannels in the browser process ChannelProxy instead, since no code in the browser should send synchronous IPC messages. The renderer one was done like that a long time ago to send sync IPCs for accessibility, and we learnt that that doesn't work.
BUG=76697
Review URL: http://codereview.chromium.org/7046100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/utility_process_host.cc')
| -rw-r--r-- | content/browser/utility_process_host.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc index 44a8037..ce7e1d2 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/message_loop.h" -#include "chrome/browser/browser_process.h" -#include "chrome/common/chrome_switches.h" +#include "content/browser/content_browser_client.h" +#include "content/common/content_switches.h" #include "content/common/utility_messages.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" @@ -87,7 +87,8 @@ bool UtilityProcessHost::StartProcess() { cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kUtilityProcess); cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); - std::string locale = g_browser_process->GetApplicationLocale(); + std::string locale = + content::GetContentClient()->browser()->GetApplicationLocale(); cmd_line->AppendSwitchASCII(switches::kLang, locale); const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); @@ -96,11 +97,6 @@ bool UtilityProcessHost::StartProcess() { if (browser_command_line.HasSwitch(switches::kNoSandbox)) cmd_line->AppendSwitch(switches::kNoSandbox); - if (browser_command_line.HasSwitch( - switches::kEnableExperimentalExtensionApis)) { - cmd_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); - } - #if defined(OS_POSIX) // TODO(port): Sandbox this on Linux. Also, zygote this to work with // Linux updating. |