diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 18:51:47 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 18:51:47 +0000 |
commit | b5ce736e9dc768a1156dd33a906b3ed4bfbd2276 (patch) | |
tree | 596e448d5064142853a64646a78382398f968adc /chrome/browser/chromeos | |
parent | 96b3760243c36ed846179c18f22b91d4c996fe66 (diff) | |
download | chromium_src-b5ce736e9dc768a1156dd33a906b3ed4bfbd2276.zip chromium_src-b5ce736e9dc768a1156dd33a906b3ed4bfbd2276.tar.gz chromium_src-b5ce736e9dc768a1156dd33a906b3ed4bfbd2276.tar.bz2 |
Clean up users of a deprecated base::LaunchApp API.
BUG=88990
Review URL: http://codereview.chromium.org/7346017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager.cc | 10 | ||||
-rw-r--r-- | chrome/browser/chromeos/input_method/xkeyboard.cc | 10 |
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; |