content/browser/android/content_view_core_impl.cc - Issue 49823002: Move navigation and frame tree classes to a new frame_host/ directory.

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

Issue 49823002: Move navigation and frame tree classes to a new frame_host/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing gyp and adding TODO. Created 7 years, 1 month 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 | « no previous file | content/browser/browser_url_handler_impl.cc » ('j') | no next file with comments »

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/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

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

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

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

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

19 #include "content/browser/android/load_url_params.h"	19 #include "content/browser/android/load_url_params.h"

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

	21 #include "content/browser/frame_host/interstitial_page_impl.h"

	22 #include "content/browser/frame_host/navigation_controller_impl.h"

	23 #include "content/browser/frame_host/navigation_entry_impl.h"

21 #include "content/browser/media/android/browser_media_player_manager.h"	24 #include "content/browser/media/android/browser_media_player_manager.h"

22 #include "content/browser/renderer_host/compositor_impl_android.h"	25 #include "content/browser/renderer_host/compositor_impl_android.h"

23 #include "content/browser/renderer_host/input/web_input_event_builders_android.h "	26 #include "content/browser/renderer_host/input/web_input_event_builders_android.h "

24 #include "content/browser/renderer_host/java/java_bound_object.h"	27 #include "content/browser/renderer_host/java/java_bound_object.h"

25 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"	28 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"

26 #include "content/browser/renderer_host/render_view_host_impl.h"	29 #include "content/browser/renderer_host/render_view_host_impl.h"

27 #include "content/browser/renderer_host/render_widget_host_impl.h"	30 #include "content/browser/renderer_host/render_widget_host_impl.h"

28 #include "content/browser/renderer_host/render_widget_host_view_android.h"	31 #include "content/browser/renderer_host/render_widget_host_view_android.h"

29 #include "content/browser/ssl/ssl_host_state.h"	32 #include "content/browser/ssl/ssl_host_state.h"

30 #include "content/browser/web_contents/interstitial_page_impl.h"

31 #include "content/browser/web_contents/navigation_controller_impl.h"

32 #include "content/browser/web_contents/navigation_entry_impl.h"

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

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

35 #include "content/common/view_messages.h"	35 #include "content/common/view_messages.h"

36 #include "content/public/browser/browser_accessibility_state.h"	36 #include "content/public/browser/browser_accessibility_state.h"

37 #include "content/public/browser/browser_context.h"	37 #include "content/public/browser/browser_context.h"

38 #include "content/public/browser/favicon_status.h"	38 #include "content/public/browser/favicon_status.h"

39 #include "content/public/browser/notification_details.h"	39 #include "content/public/browser/notification_details.h"

40 #include "content/public/browser/notification_service.h"	40 #include "content/public/browser/notification_service.h"

41 #include "content/public/browser/notification_source.h"	41 #include "content/public/browser/notification_source.h"

42 #include "content/public/browser/notification_types.h"	42 #include "content/public/browser/notification_types.h"

(...skipping 1591 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1634 reinterpret_cast<ui::ViewAndroid*>(view_android),	1634 reinterpret_cast<ui::ViewAndroid*>(view_android),

1635 reinterpret_cast<ui::WindowAndroid*>(window_android));	1635 reinterpret_cast<ui::WindowAndroid*>(window_android));

1636 return reinterpret_cast<jint>(view);	1636 return reinterpret_cast<jint>(view);

1637 }	1637 }

1638	1638

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

1640 return RegisterNativesImpl(env);	1640 return RegisterNativesImpl(env);

1641 }	1641 }

1642	1642

1643 } // namespace content	1643 } // namespace content

OLD	NEW