From dc0f95d653279beabeb9817299e2902918ba123e Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 9 Jun 2011 11:47:42 +0100 Subject: Merge Chromium at r11.0.696.0: Initial merge by git Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d --- chrome/browser/utility_process_host.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'chrome/browser/utility_process_host.cc') diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc index 378f945..c715377 100644 --- a/chrome/browser/utility_process_host.cc +++ b/chrome/browser/utility_process_host.cc @@ -12,6 +12,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/indexed_db_key.h" +#include "chrome/common/serialized_script_value.h" #include "chrome/common/utility_messages.h" #include "ipc/ipc_switches.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -76,6 +77,16 @@ bool UtilityProcessHost::StartIDBKeysFromValuesAndKeyPath( return true; } +bool UtilityProcessHost::StartInjectIDBKey( + const IndexedDBKey& key, const SerializedScriptValue& value, + const string16& key_path) { + if (!StartProcess(FilePath())) + return false; + + Send(new UtilityMsg_InjectIDBKey(key, value, key_path)); + return true; +} + bool UtilityProcessHost::StartBatchMode() { CHECK(!is_batch_mode_); is_batch_mode_ = StartProcess(FilePath()); @@ -121,6 +132,8 @@ bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) { const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); if (browser_command_line.HasSwitch(switches::kChromeFrame)) cmd_line->AppendSwitch(switches::kChromeFrame); + if (browser_command_line.HasSwitch(switches::kNoSandbox)) + cmd_line->AppendSwitch(switches::kNoSandbox); if (browser_command_line.HasSwitch( switches::kEnableExperimentalExtensionApis)) { @@ -195,6 +208,8 @@ bool UtilityProcessHost::Client::OnMessageReceived( Client::OnIDBKeysFromValuesAndKeyPathSucceeded) IPC_MESSAGE_HANDLER(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Failed, Client::OnIDBKeysFromValuesAndKeyPathFailed) + IPC_MESSAGE_HANDLER(UtilityHostMsg_InjectIDBKey_Finished, + Client::OnInjectIDBKeyFinished) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() return handled; -- cgit v1.1