| OLD | NEW |
| 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 "content/browser/service_manager/service_manager_context.h" | 5 #include "content/browser/service_manager/service_manager_context.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "services/device/public/interfaces/constants.mojom.h" | 45 #include "services/device/public/interfaces/constants.mojom.h" |
| 46 #include "services/service_manager/connect_params.h" | 46 #include "services/service_manager/connect_params.h" |
| 47 #include "services/service_manager/public/cpp/connector.h" | 47 #include "services/service_manager/public/cpp/connector.h" |
| 48 #include "services/service_manager/public/cpp/service.h" | 48 #include "services/service_manager/public/cpp/service.h" |
| 49 #include "services/service_manager/public/interfaces/service.mojom.h" | 49 #include "services/service_manager/public/interfaces/service.mojom.h" |
| 50 #include "services/service_manager/runner/common/client_util.h" | 50 #include "services/service_manager/runner/common/client_util.h" |
| 51 #include "services/service_manager/service_manager.h" | 51 #include "services/service_manager/service_manager.h" |
| 52 #include "services/shape_detection/public/interfaces/constants.mojom.h" | 52 #include "services/shape_detection/public/interfaces/constants.mojom.h" |
| 53 | 53 |
| 54 #if defined(OS_ANDROID) | 54 #if defined(OS_ANDROID) |
| 55 #include "base/android/context_utils.h" | |
| 56 #include "base/android/jni_android.h" | 55 #include "base/android/jni_android.h" |
| 57 #include "base/android/scoped_java_ref.h" | 56 #include "base/android/scoped_java_ref.h" |
| 58 #include "jni/ContentNfcDelegate_jni.h" | 57 #include "jni/ContentNfcDelegate_jni.h" |
| 59 #endif | 58 #endif |
| 60 | 59 |
| 61 namespace content { | 60 namespace content { |
| 62 | 61 |
| 63 namespace { | 62 namespace { |
| 64 | 63 |
| 65 base::LazyInstance<std::unique_ptr<service_manager::Connector>>::Leaky | 64 base::LazyInstance<std::unique_ptr<service_manager::Connector>>::Leaky |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 base::Bind(&DestroyConnectorOnIOThread)); | 401 base::Bind(&DestroyConnectorOnIOThread)); |
| 403 } | 402 } |
| 404 | 403 |
| 405 // static | 404 // static |
| 406 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { | 405 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { |
| 407 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 406 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 408 return g_io_thread_connector.Get().get(); | 407 return g_io_thread_connector.Get().get(); |
| 409 } | 408 } |
| 410 | 409 |
| 411 } // namespace content | 410 } // namespace content |
| OLD | NEW |