Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(668)

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

Issue 2192683003: Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2810
Patch Set: Created 4 years, 4 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
« no previous file with comments | « content/browser/android/browser_jni_registrar.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "cc/layers/layer.h" 20 #include "cc/layers/layer.h"
21 #include "cc/layers/solid_color_layer.h" 21 #include "cc/layers/solid_color_layer.h"
22 #include "cc/output/begin_frame_args.h" 22 #include "cc/output/begin_frame_args.h"
23 #include "content/browser/accessibility/browser_accessibility_manager_android.h" 23 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
24 #include "content/browser/accessibility/browser_accessibility_state_impl.h" 24 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
25 #include "content/browser/android/gesture_event_type.h" 25 #include "content/browser/android/gesture_event_type.h"
26 #include "content/browser/android/interstitial_page_delegate_android.h" 26 #include "content/browser/android/interstitial_page_delegate_android.h"
27 #include "content/browser/android/java/gin_java_bridge_dispatcher_host.h" 27 #include "content/browser/android/java/gin_java_bridge_dispatcher_host.h"
28 #include "content/browser/android/load_url_params.h" 28 #include "content/browser/android/load_url_params.h"
29 #include "content/browser/frame_host/interstitial_page_impl.h" 29 #include "content/browser/frame_host/interstitial_page_impl.h"
30 #include "content/browser/geolocation/geolocation_service_context.h"
30 #include "content/browser/media/media_web_contents_observer.h" 31 #include "content/browser/media/media_web_contents_observer.h"
31 #include "content/browser/renderer_host/compositor_impl_android.h" 32 #include "content/browser/renderer_host/compositor_impl_android.h"
32 #include "content/browser/renderer_host/input/web_input_event_builders_android.h " 33 #include "content/browser/renderer_host/input/web_input_event_builders_android.h "
33 #include "content/browser/renderer_host/input/web_input_event_util.h" 34 #include "content/browser/renderer_host/input/web_input_event_util.h"
34 #include "content/browser/renderer_host/render_view_host_impl.h" 35 #include "content/browser/renderer_host/render_view_host_impl.h"
35 #include "content/browser/renderer_host/render_widget_host_impl.h" 36 #include "content/browser/renderer_host/render_widget_host_impl.h"
36 #include "content/browser/renderer_host/render_widget_host_view_android.h" 37 #include "content/browser/renderer_host/render_widget_host_view_android.h"
37 #include "content/browser/web_contents/web_contents_view_android.h" 38 #include "content/browser/web_contents/web_contents_view_android.h"
38 #include "content/common/frame_messages.h" 39 #include "content/common/frame_messages.h"
39 #include "content/common/input/web_input_event_traits.h" 40 #include "content/common/input/web_input_event_traits.h"
40 #include "content/common/input_messages.h" 41 #include "content/common/input_messages.h"
41 #include "content/common/view_messages.h" 42 #include "content/common/view_messages.h"
42 #include "content/public/browser/android/compositor.h" 43 #include "content/public/browser/android/compositor.h"
43 #include "content/public/browser/browser_context.h" 44 #include "content/public/browser/browser_context.h"
44 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.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/screen_orientation_dispatcher_host.h" 48 #include "content/public/browser/screen_orientation_dispatcher_host.h"
48 #include "content/public/browser/ssl_host_state_delegate.h" 49 #include "content/public/browser/ssl_host_state_delegate.h"
49 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
50 #include "content/public/common/content_client.h" 51 #include "content/public/common/content_client.h"
51 #include "content/public/common/content_switches.h" 52 #include "content/public/common/content_switches.h"
52 #include "content/public/common/menu_item.h" 53 #include "content/public/common/menu_item.h"
53 #include "content/public/common/user_agent.h" 54 #include "content/public/common/user_agent.h"
54 #include "device/geolocation/geolocation_service_context.h"
55 #include "jni/ContentViewCore_jni.h" 55 #include "jni/ContentViewCore_jni.h"
56 #include "jni/DragEvent_jni.h" 56 #include "jni/DragEvent_jni.h"
57 #include "third_party/WebKit/public/web/WebInputEvent.h" 57 #include "third_party/WebKit/public/web/WebInputEvent.h"
58 #include "ui/android/view_android.h" 58 #include "ui/android/view_android.h"
59 #include "ui/android/window_android.h" 59 #include "ui/android/window_android.h"
60 #include "ui/base/clipboard/clipboard.h" 60 #include "ui/base/clipboard/clipboard.h"
61 #include "ui/base/ui_base_switches_util.h" 61 #include "ui/base/ui_base_switches_util.h"
62 #include "ui/events/android/motion_event_android.h" 62 #include "ui/events/android/motion_event_android.h"
63 #include "ui/events/blink/blink_event_util.h" 63 #include "ui/events/blink/blink_event_util.h"
64 #include "ui/events/event_utils.h" 64 #include "ui/events/event_utils.h"
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after
1648 return ScopedJavaLocalRef<jobject>(); 1648 return ScopedJavaLocalRef<jobject>();
1649 1649
1650 return view->GetJavaObject(); 1650 return view->GetJavaObject();
1651 } 1651 }
1652 1652
1653 bool RegisterContentViewCore(JNIEnv* env) { 1653 bool RegisterContentViewCore(JNIEnv* env) {
1654 return RegisterNativesImpl(env) && JNI_DragEvent::RegisterNativesImpl(env); 1654 return RegisterNativesImpl(env) && JNI_DragEvent::RegisterNativesImpl(env);
1655 } 1655 }
1656 1656
1657 } // namespace content 1657 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/browser_jni_registrar.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698