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

Side by Side Diff: components/arc/arc_service_manager.cc

Issue 1970833002: Fix include path for moved thread_task_runner_handle.h header in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/arc/arc_service_manager.h" 5 #include "components/arc/arc_service_manager.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/sequenced_task_runner.h" 8 #include "base/sequenced_task_runner.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "components/arc/arc_bridge_bootstrap.h" 10 #include "components/arc/arc_bridge_bootstrap.h"
11 #include "components/arc/arc_bridge_service.h" 11 #include "components/arc/arc_bridge_service.h"
12 #include "components/arc/arc_bridge_service_impl.h" 12 #include "components/arc/arc_bridge_service_impl.h"
13 #include "components/arc/audio/arc_audio_bridge.h" 13 #include "components/arc/audio/arc_audio_bridge.h"
14 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" 14 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
15 #include "components/arc/clipboard/arc_clipboard_bridge.h" 15 #include "components/arc/clipboard/arc_clipboard_bridge.h"
16 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" 16 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
17 #include "components/arc/ime/arc_ime_service.h" 17 #include "components/arc/ime/arc_ime_service.h"
18 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 18 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
19 #include "components/arc/metrics/arc_metrics_service.h" 19 #include "components/arc/metrics/arc_metrics_service.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 //static 113 //static
114 void ArcServiceManager::SetArcBridgeServiceForTesting( 114 void ArcServiceManager::SetArcBridgeServiceForTesting(
115 std::unique_ptr<ArcBridgeService> arc_bridge_service) { 115 std::unique_ptr<ArcBridgeService> arc_bridge_service) {
116 if (g_arc_bridge_service_for_testing) { 116 if (g_arc_bridge_service_for_testing) {
117 delete g_arc_bridge_service_for_testing; 117 delete g_arc_bridge_service_for_testing;
118 } 118 }
119 g_arc_bridge_service_for_testing = arc_bridge_service.release(); 119 g_arc_bridge_service_for_testing = arc_bridge_service.release();
120 } 120 }
121 121
122 } // namespace arc 122 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_service_impl.cc ('k') | components/arc/bluetooth/arc_bluetooth_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698