| OLD | NEW |
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 base::GetAppOutput(commands[i].second, &output); | 48 base::GetAppOutput(commands[i].second, &output); |
| 49 (*response)[commands[i].first] = output; | 49 (*response)[commands[i].first] = output; |
| 50 } | 50 } |
| 51 } | 51 } |
| 52 | 52 |
| 53 } // namespace | 53 } // namespace |
| 54 | 54 |
| 55 namespace system_logs { | 55 namespace system_logs { |
| 56 | 56 |
| 57 void TouchLogSource::Fetch(const SysLogsSourceCallback& callback) { | 57 void TouchLogSource::Fetch(const SysLogsSourceCallback& callback) { |
| 58 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 58 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 59 DCHECK(!callback.is_null()); | 59 DCHECK(!callback.is_null()); |
| 60 | 60 |
| 61 SystemLogsResponse* response = new SystemLogsResponse; | 61 SystemLogsResponse* response = new SystemLogsResponse; |
| 62 BrowserThread::PostBlockingPoolTaskAndReply( | 62 BrowserThread::PostBlockingPoolTaskAndReply( |
| 63 FROM_HERE, base::Bind(&GetTouchLogsX11, response), | 63 FROM_HERE, base::Bind(&GetTouchLogsX11, response), |
| 64 base::Bind(callback, base::Owned(response))); | 64 base::Bind(callback, base::Owned(response))); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace system_logs | 67 } // namespace system_logs |
| OLD | NEW |