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

Side by Side Diff: chrome/browser/chromeos/system_logs/touch_log_source.cc

Issue 335453008: system_logs/touch_log_source: Updated path to log scripts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/system_logs/touch_log_source.h" 5 #include "chrome/browser/chromeos/system_logs/touch_log_source.h"
6 6
7 #include "ash/touch/touch_hud_debug.h" 7 #include "ash/touch/touch_hud_debug.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_string_value_serializer.h" 10 #include "base/json/json_string_value_serializer.h"
(...skipping 13 matching lines...) Expand all
24 if (!dictionary->empty()) { 24 if (!dictionary->empty()) {
25 std::string touch_log; 25 std::string touch_log;
26 JSONStringValueSerializer json(&touch_log); 26 JSONStringValueSerializer json(&touch_log);
27 json.set_pretty_print(true); 27 json.set_pretty_print(true);
28 if (json.Serialize(*dictionary) && !touch_log.empty()) 28 if (json.Serialize(*dictionary) && !touch_log.empty())
29 (*response)[kHUDLogDataKey] = touch_log; 29 (*response)[kHUDLogDataKey] = touch_log;
30 } 30 }
31 31
32 std::vector<std::pair<std::string, CommandLine> > commands; 32 std::vector<std::pair<std::string, CommandLine> > commands;
33 CommandLine command = 33 CommandLine command =
34 CommandLine(base::FilePath("/opt/google/touchpad/tpcontrol")); 34 CommandLine(base::FilePath("/opt/google/input/inputcontrol"));
35 command.AppendArg("status"); 35 command.AppendArg("--status");
36 commands.push_back(std::make_pair("hack-33025-touchpad", command)); 36 commands.push_back(std::make_pair("hack-33025-touchpad", command));
37 37
38 command = 38 command =
39 CommandLine(base::FilePath("/opt/google/touchpad/generate_userfeedback")); 39 CommandLine(base::FilePath("/opt/google/input/cmt_feedback"));
40 commands.push_back(std::make_pair("hack-33025-touchpad_activity", command)); 40 commands.push_back(std::make_pair("hack-33025-touchpad_activity", command));
41 41
42 command = CommandLine( 42 command = CommandLine(
43 base::FilePath("/opt/google/touchscreen/touchscreen_feedback")); 43 base::FilePath("/opt/google/input/evdev_feedback"));
44 commands.push_back( 44 commands.push_back(
45 std::make_pair("hack-33025-touchscreen_activity", command)); 45 std::make_pair("hack-33025-touchscreen_activity", command));
46 46
47 for (size_t i = 0; i < commands.size(); ++i) { 47 for (size_t i = 0; i < commands.size(); ++i) {
48 std::string output; 48 std::string output;
49 base::GetAppOutput(commands[i].second, &output); 49 base::GetAppOutput(commands[i].second, &output);
50 (*response)[commands[i].first] = output; 50 (*response)[commands[i].first] = output;
51 } 51 }
52 } 52 }
53 53
(...skipping 12 matching lines...) Expand all
66 DCHECK(!callback.is_null()); 66 DCHECK(!callback.is_null());
67 67
68 SystemLogsResponse* response = new SystemLogsResponse; 68 SystemLogsResponse* response = new SystemLogsResponse;
69 BrowserThread::PostBlockingPoolTaskAndReply( 69 BrowserThread::PostBlockingPoolTaskAndReply(
70 FROM_HERE, 70 FROM_HERE,
71 base::Bind(&GetTouchLogs, response), 71 base::Bind(&GetTouchLogs, response),
72 base::Bind(callback, base::Owned(response))); 72 base::Bind(callback, base::Owned(response)));
73 } 73 }
74 74
75 } // namespace system_logs 75 } // namespace system_logs
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698