| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/client/app/android/blimp_environment.h" | 5 #include "blimp/client/app/android/blimp_environment.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/android/apk_assets.h" | 9 #include "base/android/apk_assets.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/files/file.h" | 11 #include "base/files/file.h" |
| 12 #include "base/files/memory_mapped_file.h" | 12 #include "base/files/memory_mapped_file.h" |
| 13 #include "base/memory/ptr_util.h" |
| 13 #include "base/threading/thread.h" | 14 #include "base/threading/thread.h" |
| 14 #include "blimp/client/app/android/blimp_client_context_delegate_android.h" | 15 #include "blimp/client/app/android/blimp_client_context_delegate_android.h" |
| 15 #include "blimp/client/app/blimp_startup.h" | 16 #include "blimp/client/app/blimp_startup.h" |
| 16 #include "blimp/client/public/blimp_client_context.h" | 17 #include "blimp/client/public/blimp_client_context.h" |
| 17 #include "blimp/client/support/compositor/compositor_dependencies_impl.h" | 18 #include "blimp/client/support/compositor/compositor_dependencies_impl.h" |
| 18 #include "components/pref_registry/pref_registry_syncable.h" | 19 #include "components/pref_registry/pref_registry_syncable.h" |
| 19 #include "components/prefs/command_line_pref_store.h" | 20 #include "components/prefs/command_line_pref_store.h" |
| 20 #include "components/prefs/in_memory_pref_store.h" | 21 #include "components/prefs/in_memory_pref_store.h" |
| 21 #include "components/prefs/pref_service.h" | 22 #include "components/prefs/pref_service.h" |
| 22 #include "components/prefs/pref_service_factory.h" | 23 #include "components/prefs/pref_service_factory.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 return reinterpret_cast<intptr_t>(blimp_environment); | 171 return reinterpret_cast<intptr_t>(blimp_environment); |
| 171 } | 172 } |
| 172 | 173 |
| 173 // static | 174 // static |
| 174 bool BlimpEnvironment::RegisterJni(JNIEnv* env) { | 175 bool BlimpEnvironment::RegisterJni(JNIEnv* env) { |
| 175 return RegisterNativesImpl(env); | 176 return RegisterNativesImpl(env); |
| 176 } | 177 } |
| 177 | 178 |
| 178 } // namespace client | 179 } // namespace client |
| 179 } // namespace blimp | 180 } // namespace blimp |
| OLD | NEW |