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

Side by Side Diff: chromeos/dbus/fake_nfc_device_client.cc

Issue 1966093003: Fix include path for moved thread_task_runner_handle.h header in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: Created 4 years, 7 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
« no previous file with comments | « chromeos/dbus/fake_lorgnette_manager_client.cc ('k') | chromeos/dbus/fake_nfc_tag_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chromeos/dbus/fake_nfc_device_client.h" 5 #include "chromeos/dbus/fake_nfc_device_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "chromeos/dbus/fake_nfc_adapter_client.h" 14 #include "chromeos/dbus/fake_nfc_adapter_client.h"
15 #include "chromeos/dbus/fake_nfc_record_client.h" 15 #include "chromeos/dbus/fake_nfc_record_client.h"
16 #include "dbus/object_path.h" 16 #include "dbus/object_path.h"
17 #include "third_party/cros_system_api/dbus/service_constants.h" 17 #include "third_party/cros_system_api/dbus/service_constants.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 using nfc_client_helpers::ObjectPathVector; 21 using nfc_client_helpers::ObjectPathVector;
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 void FakeNfcDeviceClient::HandleSimulationTimeout() { 232 void FakeNfcDeviceClient::HandleSimulationTimeout() {
233 if (simulation_timeout_ < 0) { 233 if (simulation_timeout_ < 0) {
234 VLOG(1) << "Simulation timeout was cancelled. Nothing to do."; 234 VLOG(1) << "Simulation timeout was cancelled. Nothing to do.";
235 return; 235 return;
236 } 236 }
237 EndPairingSimulation(); 237 EndPairingSimulation();
238 } 238 }
239 239
240 } // namespace chromeos 240 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/fake_lorgnette_manager_client.cc ('k') | chromeos/dbus/fake_nfc_tag_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698