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

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

Issue 2515823002: Remove WebContents::GetRoutingID(). (Closed)
Patch Set: added a TODO for the external protocol bug Created 4 years 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
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"
(...skipping 24 matching lines...) Expand all
35 #include "content/browser/renderer_host/render_widget_host_view_android.h" 35 #include "content/browser/renderer_host/render_widget_host_view_android.h"
36 #include "content/browser/web_contents/web_contents_view_android.h" 36 #include "content/browser/web_contents/web_contents_view_android.h"
37 #include "content/common/frame_messages.h" 37 #include "content/common/frame_messages.h"
38 #include "content/common/input_messages.h" 38 #include "content/common/input_messages.h"
39 #include "content/common/view_messages.h" 39 #include "content/common/view_messages.h"
40 #include "content/public/browser/android/compositor.h" 40 #include "content/public/browser/android/compositor.h"
41 #include "content/public/browser/browser_context.h" 41 #include "content/public/browser/browser_context.h"
42 #include "content/public/browser/browser_thread.h" 42 #include "content/public/browser/browser_thread.h"
43 #include "content/public/browser/favicon_status.h" 43 #include "content/public/browser/favicon_status.h"
44 #include "content/public/browser/render_frame_host.h" 44 #include "content/public/browser/render_frame_host.h"
45 #include "content/public/browser/render_view_host.h"
45 #include "content/public/browser/screen_orientation_provider.h" 46 #include "content/public/browser/screen_orientation_provider.h"
46 #include "content/public/browser/ssl_host_state_delegate.h" 47 #include "content/public/browser/ssl_host_state_delegate.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"
50 #include "content/public/common/menu_item.h" 51 #include "content/public/common/menu_item.h"
51 #include "content/public/common/user_agent.h" 52 #include "content/public/common/user_agent.h"
52 #include "device/geolocation/geolocation_service_context.h" 53 #include "device/geolocation/geolocation_service_context.h"
53 #include "jni/ContentViewCore_jni.h" 54 #include "jni/ContentViewCore_jni.h"
54 #include "jni/DragEvent_jni.h" 55 #include "jni/DragEvent_jni.h"
(...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 jint width, 1403 jint width,
1403 jint height) { 1404 jint height) {
1404 gfx::Rect rect( 1405 gfx::Rect rect(
1405 static_cast<int>(x / dpi_scale()), 1406 static_cast<int>(x / dpi_scale()),
1406 static_cast<int>(y / dpi_scale()), 1407 static_cast<int>(y / dpi_scale()),
1407 static_cast<int>((width > 0 && width < dpi_scale()) ? 1408 static_cast<int>((width > 0 && width < dpi_scale()) ?
1408 1 : (int)(width / dpi_scale())), 1409 1 : (int)(width / dpi_scale())),
1409 static_cast<int>((height > 0 && height < dpi_scale()) ? 1410 static_cast<int>((height > 0 && height < dpi_scale()) ?
1410 1 : (int)(height / dpi_scale()))); 1411 1 : (int)(height / dpi_scale())));
1411 GetWebContents()->Send(new ViewMsg_ExtractSmartClipData( 1412 GetWebContents()->Send(new ViewMsg_ExtractSmartClipData(
1412 GetWebContents()->GetRoutingID(), rect)); 1413 GetWebContents()->GetRenderViewHost()->GetRoutingID(), rect));
1413 } 1414 }
1414 1415
1415 jint ContentViewCoreImpl::GetCurrentRenderProcessId( 1416 jint ContentViewCoreImpl::GetCurrentRenderProcessId(
1416 JNIEnv* env, 1417 JNIEnv* env,
1417 const JavaParamRef<jobject>& obj) { 1418 const JavaParamRef<jobject>& obj) {
1418 return GetRenderProcessIdFromRenderViewHost( 1419 return GetRenderProcessIdFromRenderViewHost(
1419 web_contents_->GetRenderViewHost()); 1420 web_contents_->GetRenderViewHost());
1420 } 1421 }
1421 1422
1422 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, 1423 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env,
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1608 return ScopedJavaLocalRef<jobject>(); 1609 return ScopedJavaLocalRef<jobject>();
1609 1610
1610 return view->GetJavaObject(); 1611 return view->GetJavaObject();
1611 } 1612 }
1612 1613
1613 bool RegisterContentViewCore(JNIEnv* env) { 1614 bool RegisterContentViewCore(JNIEnv* env) {
1614 return RegisterNativesImpl(env); 1615 return RegisterNativesImpl(env);
1615 } 1616 }
1616 1617
1617 } // namespace content 1618 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698