content/browser/android/content_view_core_impl.cc - Issue 336313018: [Android] Move content/browser/{renderer_host => android}/java/*

Side by Side Diff: content/browser/android/content_view_core_impl.cc

Issue 336313018: [Android] Move content/browser/{renderer_host => android}/java/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « content/browser/android/browser_jni_registrar.cc ('k') | content/browser/android/java/DEPS » ('j') | content/browser/android/java/DEPS » ('J')

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"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/json/json_writer.h"	12 #include "base/json/json_writer.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

14 #include "base/metrics/histogram.h"	14 #include "base/metrics/histogram.h"

15 #include "base/strings/utf_string_conversions.h"	15 #include "base/strings/utf_string_conversions.h"

16 #include "base/values.h"	16 #include "base/values.h"

17 #include "cc/layers/layer.h"	17 #include "cc/layers/layer.h"

18 #include "cc/layers/solid_color_layer.h"	18 #include "cc/layers/solid_color_layer.h"

19 #include "cc/output/begin_frame_args.h"	19 #include "cc/output/begin_frame_args.h"

20 #include "content/browser/android/gesture_event_type.h"	20 #include "content/browser/android/gesture_event_type.h"

21 #include "content/browser/android/interstitial_page_delegate_android.h"	21 #include "content/browser/android/interstitial_page_delegate_android.h"

	22 #include "content/browser/android/java/java_bound_object.h"

	23 #include "content/browser/android/java/java_bridge_dispatcher_host_manager.h"

22 #include "content/browser/android/load_url_params.h"	24 #include "content/browser/android/load_url_params.h"

23 #include "content/browser/frame_host/interstitial_page_impl.h"	25 #include "content/browser/frame_host/interstitial_page_impl.h"

24 #include "content/browser/frame_host/navigation_controller_impl.h"	26 #include "content/browser/frame_host/navigation_controller_impl.h"

25 #include "content/browser/frame_host/navigation_entry_impl.h"	27 #include "content/browser/frame_host/navigation_entry_impl.h"

26 #include "content/browser/geolocation/geolocation_dispatcher_host.h"	28 #include "content/browser/geolocation/geolocation_dispatcher_host.h"

27 #include "content/browser/media/media_web_contents_observer.h"	29 #include "content/browser/media/media_web_contents_observer.h"

28 #include "content/browser/renderer_host/compositor_impl_android.h"	30 #include "content/browser/renderer_host/compositor_impl_android.h"

29 #include "content/browser/renderer_host/input/motion_event_android.h"	31 #include "content/browser/renderer_host/input/motion_event_android.h"

30 #include "content/browser/renderer_host/input/web_input_event_builders_android.h "	32 #include "content/browser/renderer_host/input/web_input_event_builders_android.h "

31 #include "content/browser/renderer_host/input/web_input_event_util.h"	33 #include "content/browser/renderer_host/input/web_input_event_util.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"

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/transition_request_manager.h"	39 #include "content/browser/transition_request_manager.h"

40 #include "content/browser/web_contents/web_contents_view_android.h"	40 #include "content/browser/web_contents/web_contents_view_android.h"

41 #include "content/common/frame_messages.h"	41 #include "content/common/frame_messages.h"

42 #include "content/common/input/web_input_event_traits.h"	42 #include "content/common/input/web_input_event_traits.h"

43 #include "content/common/input_messages.h"	43 #include "content/common/input_messages.h"

(...skipping 1646 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1690 reinterpret_cast<ui::WindowAndroid*>(window_android),	1690 reinterpret_cast<ui::WindowAndroid*>(window_android),

1691 retained_objects_set);	1691 retained_objects_set);

1692 return reinterpret_cast<intptr_t>(view);	1692 return reinterpret_cast<intptr_t>(view);

1693 }	1693 }

1694	1694

1695 bool RegisterContentViewCore(JNIEnv* env) {	1695 bool RegisterContentViewCore(JNIEnv* env) {

1696 return RegisterNativesImpl(env);	1696 return RegisterNativesImpl(env);

1697 }	1697 }

1698	1698

1699 } // namespace content	1699 } // namespace content

OLD	NEW