summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/input_method/input_method_manager.cc10
-rw-r--r--chrome/browser/chromeos/input_method/xkeyboard.cc10
2 files changed, 8 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc
index da81d24..6270612 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager.cc
@@ -757,16 +757,14 @@ class InputMethodManagerImpl : public InputMethodManager,
bool LaunchInputMethodProcess(const std::string& command_line,
base::ProcessHandle* process_handle) {
std::vector<std::string> argv;
- base::file_handle_mapping_vector fds_to_remap;
base::ProcessHandle handle = base::kNullProcessHandle;
// TODO(zork): export "LD_PRELOAD=/usr/lib/libcrash.so"
base::SplitString(command_line, ' ', &argv);
- const bool result = base::LaunchApp(argv,
- fds_to_remap, // no remapping
- false, // wait
- &handle);
- if (!result) {
+
+ base::LaunchOptions options;
+ options.process_handle = &handle;
+ if (!base::LaunchProcess(argv, options)) {
LOG(ERROR) << "Could not launch: " << command_line;
return false;
}
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc
index 6f35df2..9def5e8 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard.cc
@@ -279,18 +279,16 @@ class XKeyboard {
const std::string layout_to_set = execute_queue_.front();
std::vector<std::string> argv;
- base::file_handle_mapping_vector fds_to_remap;
base::ProcessHandle handle = base::kNullProcessHandle;
argv.push_back(kSetxkbmapCommand);
argv.push_back("-layout");
argv.push_back(layout_to_set);
argv.push_back("-synch");
- const bool result = base::LaunchApp(argv,
- fds_to_remap, // No remapping.
- false, // Don't wait.
- &handle);
- if (!result) {
+
+ base::LaunchOptions options;
+ options.process_handle = &handle;
+ if (!base::LaunchProcess(argv, options)) {
LOG(ERROR) << "Failed to execute setxkbmap: " << layout_to_set;
execute_queue_ = std::queue<std::string>(); // clear the queue.
return;