Chromium Code Reviews| Index: chrome/browser/chromeos/syslogs/commandline_fetcher.cc |
| diff --git a/chrome/browser/chromeos/syslogs/commandline_fetcher.cc b/chrome/browser/chromeos/syslogs/commandline_fetcher.cc |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..b4e34d960103d553966c4605ca066f06c583f8c9 |
| --- /dev/null |
| +++ b/chrome/browser/chromeos/syslogs/commandline_fetcher.cc |
| @@ -0,0 +1,73 @@ |
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| + |
| +#include "chrome/browser/chromeos/syslogs/commandline_fetcher.h" |
| + |
| +#include <string> |
| +#include <vector> |
| + |
| +#include "base/bind.h" |
| +#include "base/bind_helpers.h" |
| +#include "base/command_line.h" |
| +#include "base/file_path.h" |
| +#include "base/file_util.h" |
| +#include "base/logging.h" |
| +#include "base/process_util.h" |
| +#include "content/public/browser/browser_thread.h" |
| + |
| +using content::BrowserThread; |
| + |
| +namespace { |
| + |
| +void Execute(const chromeos::SysLogsFetcherCallback& request) { |
|
satorux1
2012/08/09 21:15:07
Function comment is missing.
tudalex(Chromium)
2012/08/10 00:30:31
Done.
|
| + // TODO(tudalex): Move program calling in a array or something similar to make |
| + // it more easier to modify and understand. |
| + std::vector<std::pair<std::string, CommandLine> > commands; |
| + chromeos::SysLogsResponse* response = new chromeos::SysLogsResponse; |
| + // Needed to initialize an empty command, but the constructor was private |
| + CommandLine command(FilePath("/usr/bin/cras_test_client")); |
| + command.AppendArg("--dump_server_info"); |
| + commands.push_back(std::make_pair("cras", command)); |
| + |
| + command = CommandLine((FilePath("set"))); |
| + commands.push_back(std::make_pair("env", command)); |
| + |
| + command = CommandLine(FilePath("/usr/bin/setxkbmap")); |
| + command.AppendArg("-print"); |
| + command.AppendArg("-query"); |
| + commands.push_back(std::make_pair("setxkbmap", command)); |
| + |
| + command = CommandLine(FilePath("/usr/bin/xrandr")); |
| + command.AppendArg("--verbose"); |
| + commands.push_back(std::make_pair("xrandr", command)); |
| + |
| + command = CommandLine(FilePath("/opt/google/touchpad/tpcontrol")); |
| + commands.push_back(std::make_pair("hack-33025-touchpad", command)); |
| + |
| + command = CommandLine(FilePath("/opt/google/touchpad/generate_userfeedback")); |
| + commands.push_back(std::make_pair("hack-33025-touchpad_activity", command)); |
| + |
| + |
| + std::vector< std::pair<std::string, CommandLine> >::iterator it; |
| + for (it = commands.begin(); it != commands.end(); ++it) { |
| + std::string output; |
| + base::GetAppOutput(it->second, &output); |
| + (*response)[it->first] = output; |
| + } |
| + content::BrowserThread::PostTask(content::BrowserThread::UI, |
|
satorux1
2012/08/09 21:15:07
This is unusual. Please use PostTaskAndReply idiom
tudalex(Chromium)
2012/08/10 00:30:31
Done.
|
| + FROM_HERE, |
| + base::Bind(request, response)); |
| +} |
| + |
| +} // namespace |
| + |
| +namespace chromeos { |
| + |
| +void CommandLineFetcher::Fetch(const SysLogsFetcherCallback& request) { |
|
satorux1
2012/08/09 21:15:07
so you are on the UI thread here, right? Please do
tudalex(Chromium)
2012/08/10 00:30:31
Done.
|
| + BrowserThread::PostBlockingPoolTask(FROM_HERE, |
| + base::Bind(&Execute, |
| + request)); |
| +} |
| + |
| +} // namespace chromeos |