Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: chrome/browser/chromeos/system_logs/touch_log_source.cc

Issue 794943003: Separate X11 implementation of touch log source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/system_logs/touch_log_source.cc
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source.cc b/chrome/browser/chromeos/system_logs/touch_log_source.cc
index 1f322b1fec1fe0b78ff411aba59db13962e701a6..95399b33e8612fabe9b58979eddbc37a2932176b 100644
--- a/chrome/browser/chromeos/system_logs/touch_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/touch_log_source.cc
@@ -4,55 +4,6 @@
#include "chrome/browser/chromeos/system_logs/touch_log_source.h"
-#include "ash/touch/touch_hud_debug.h"
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/json/json_string_value_serializer.h"
-#include "base/process/launch.h"
-#include "components/feedback/feedback_util.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
-
-namespace {
-
-const char kHUDLogDataKey[] = "hud_log";
-
-void GetTouchLogs(system_logs::SystemLogsResponse* response) {
- scoped_ptr<base::DictionaryValue> dictionary =
- ash::TouchHudDebug::GetAllAsDictionary();
- if (!dictionary->empty()) {
- std::string touch_log;
- JSONStringValueSerializer json(&touch_log);
- json.set_pretty_print(true);
- if (json.Serialize(*dictionary) && !touch_log.empty())
- (*response)[kHUDLogDataKey] = touch_log;
- }
-
- std::vector<std::pair<std::string, CommandLine> > commands;
- CommandLine command =
- CommandLine(base::FilePath("/opt/google/input/inputcontrol"));
- command.AppendArg("--status");
- commands.push_back(std::make_pair("hack-33025-touchpad", command));
-
- command =
- CommandLine(base::FilePath("/opt/google/input/cmt_feedback"));
- commands.push_back(std::make_pair("hack-33025-touchpad_activity", command));
-
- command = CommandLine(
- base::FilePath("/opt/google/input/evdev_feedback"));
- commands.push_back(
- std::make_pair("hack-33025-touchscreen_activity", command));
-
- for (size_t i = 0; i < commands.size(); ++i) {
- std::string output;
- base::GetAppOutput(commands[i].second, &output);
- (*response)[commands[i].first] = output;
- }
-}
-
-} // namespace
-
namespace system_logs {
TouchLogSource::TouchLogSource() : SystemLogsSource("Touch") {
achuithb 2014/12/11 20:19:08 Any reason to not move these to the header file an
Shecky Lin 2014/12/12 08:31:22 Done.
@@ -61,15 +12,4 @@ TouchLogSource::TouchLogSource() : SystemLogsSource("Touch") {
TouchLogSource::~TouchLogSource() {
}
-void TouchLogSource::Fetch(const SysLogsSourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!callback.is_null());
-
- SystemLogsResponse* response = new SystemLogsResponse;
- BrowserThread::PostBlockingPoolTaskAndReply(
- FROM_HERE,
- base::Bind(&GetTouchLogs, response),
- base::Bind(callback, base::Owned(response)));
-}
-
} // namespace system_logs

Powered by Google App Engine
This is Rietveld 408576698