| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "chrome/browser/utility_process_host.h" | 5 #include "chrome/browser/utility_process_host.h" |
| 6 | 6 |
| 7 #include "app/app_switches.h" | 7 #include "app/app_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); | 114 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); |
| 115 std::string locale = g_browser_process->GetApplicationLocale(); | 115 std::string locale = g_browser_process->GetApplicationLocale(); |
| 116 cmd_line->AppendSwitchASCII(switches::kLang, locale); | 116 cmd_line->AppendSwitchASCII(switches::kLang, locale); |
| 117 | 117 |
| 118 SetCrashReporterCommandLine(cmd_line); | 118 SetCrashReporterCommandLine(cmd_line); |
| 119 | 119 |
| 120 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 120 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
| 121 if (browser_command_line.HasSwitch(switches::kChromeFrame)) | 121 if (browser_command_line.HasSwitch(switches::kChromeFrame)) |
| 122 cmd_line->AppendSwitch(switches::kChromeFrame); | 122 cmd_line->AppendSwitch(switches::kChromeFrame); |
| 123 | 123 |
| 124 if (browser_command_line.HasSwitch(switches::kDisableApps)) | |
| 125 cmd_line->AppendSwitch(switches::kDisableApps); | |
| 126 | |
| 127 if (browser_command_line.HasSwitch( | 124 if (browser_command_line.HasSwitch( |
| 128 switches::kEnableExperimentalExtensionApis)) { | 125 switches::kEnableExperimentalExtensionApis)) { |
| 129 cmd_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 126 cmd_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
| 130 } | 127 } |
| 131 | 128 |
| 132 #if defined(OS_POSIX) | 129 #if defined(OS_POSIX) |
| 133 // TODO(port): Sandbox this on Linux. Also, zygote this to work with | 130 // TODO(port): Sandbox this on Linux. Also, zygote this to work with |
| 134 // Linux updating. | 131 // Linux updating. |
| 135 bool has_cmd_prefix = browser_command_line.HasSwitch( | 132 bool has_cmd_prefix = browser_command_line.HasSwitch( |
| 136 switches::kUtilityCmdPrefix); | 133 switches::kUtilityCmdPrefix); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Succeeded, | 183 IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Succeeded, |
| 187 Client::OnDecodeImageSucceeded) | 184 Client::OnDecodeImageSucceeded) |
| 188 IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Failed, | 185 IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Failed, |
| 189 Client::OnDecodeImageFailed) | 186 Client::OnDecodeImageFailed) |
| 190 IPC_MESSAGE_HANDLER(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded, | 187 IPC_MESSAGE_HANDLER(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded, |
| 191 Client::OnIDBKeysFromValuesAndKeyPathSucceeded) | 188 Client::OnIDBKeysFromValuesAndKeyPathSucceeded) |
| 192 IPC_MESSAGE_HANDLER(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Failed, | 189 IPC_MESSAGE_HANDLER(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Failed, |
| 193 Client::OnIDBKeysFromValuesAndKeyPathFailed) | 190 Client::OnIDBKeysFromValuesAndKeyPathFailed) |
| 194 IPC_END_MESSAGE_MAP_EX() | 191 IPC_END_MESSAGE_MAP_EX() |
| 195 } | 192 } |
| OLD | NEW |