Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/android/content_view_core_impl.h" | 5 #include "content/browser/android/content_view_core_impl.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 29 #include "content/browser/renderer_host/input/motion_event_android.h" | 29 #include "content/browser/renderer_host/input/motion_event_android.h" |
| 30 #include "content/browser/renderer_host/input/web_input_event_builders_android.h " | 30 #include "content/browser/renderer_host/input/web_input_event_builders_android.h " |
| 31 #include "content/browser/renderer_host/input/web_input_event_util.h" | 31 #include "content/browser/renderer_host/input/web_input_event_util.h" |
| 32 #include "content/browser/renderer_host/java/java_bound_object.h" | 32 #include "content/browser/renderer_host/java/java_bound_object.h" |
| 33 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" | 33 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" |
| 34 #include "content/browser/renderer_host/render_view_host_impl.h" | 34 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 35 #include "content/browser/renderer_host/render_widget_host_impl.h" | 35 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 36 #include "content/browser/renderer_host/render_widget_host_view_android.h" | 36 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 37 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host. h" | 37 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host. h" |
| 38 #include "content/browser/ssl/ssl_host_state.h" | 38 #include "content/browser/ssl/ssl_host_state.h" |
| 39 #include "content/browser/web_contents/web_contents_view_android.h" | 39 #include "content/browser/web_contents/web_contents_view_android.h" |
|
jdduke (slow)
2014/06/12 16:23:15
Nit: Looks like you can get rid of this change.
| |
| 40 #include "content/common/frame_messages.h" | |
| 40 #include "content/common/input/web_input_event_traits.h" | 41 #include "content/common/input/web_input_event_traits.h" |
| 41 #include "content/common/input_messages.h" | 42 #include "content/common/input_messages.h" |
| 42 #include "content/common/view_messages.h" | 43 #include "content/common/view_messages.h" |
| 43 #include "content/public/browser/browser_accessibility_state.h" | 44 #include "content/public/browser/browser_accessibility_state.h" |
| 44 #include "content/public/browser/browser_context.h" | 45 #include "content/public/browser/browser_context.h" |
| 45 #include "content/public/browser/favicon_status.h" | 46 #include "content/public/browser/favicon_status.h" |
| 46 #include "content/public/browser/render_frame_host.h" | 47 #include "content/public/browser/render_frame_host.h" |
| 47 #include "content/public/browser/web_contents.h" | 48 #include "content/public/browser/web_contents.h" |
| 48 #include "content/public/common/content_client.h" | 49 #include "content/public/common/content_client.h" |
| 49 #include "content/public/common/content_switches.h" | 50 #include "content/public/common/content_switches.h" |
| (...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1632 reinterpret_cast<ui::WindowAndroid*>(window_android), | 1633 reinterpret_cast<ui::WindowAndroid*>(window_android), |
| 1633 retained_objects_set); | 1634 retained_objects_set); |
| 1634 return reinterpret_cast<intptr_t>(view); | 1635 return reinterpret_cast<intptr_t>(view); |
| 1635 } | 1636 } |
| 1636 | 1637 |
| 1637 bool RegisterContentViewCore(JNIEnv* env) { | 1638 bool RegisterContentViewCore(JNIEnv* env) { |
| 1638 return RegisterNativesImpl(env); | 1639 return RegisterNativesImpl(env); |
| 1639 } | 1640 } |
| 1640 | 1641 |
| 1641 } // namespace content | 1642 } // namespace content |
| OLD | NEW |