content/public/browser/android/content_view_core.h - Issue 10823207: Consolidate ContentViewCore::Load* functions

Side by Side Diff: content/public/browser/android/content_view_core.h

Issue 10823207: Consolidate ContentViewCore::Load* functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@cleanup_load

Patch Set: Split up nativeLoadUrl parameters and get rid of most of jni code. Moved android_load_url_params. Created 8 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

« content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java ('K') | « content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java ('k') | content/shell/android/java/src/org/chromium/content_shell/Shell.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_	5 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_

6 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_	6 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9	9

10 class GURL;	10 class GURL;

(...skipping 17 matching lines...) Expand all Loading...
28 // until this issue is resolved.	28 // until this issue is resolved.

29 // http://b/6666045	29 // http://b/6666045

30 class ContentViewCore {	30 class ContentViewCore {

31 public:	31 public:

32 virtual void Destroy(JNIEnv* env, jobject obj) = 0;	32 virtual void Destroy(JNIEnv* env, jobject obj) = 0;

33	33

34 static ContentViewCore* Create(JNIEnv* env, jobject obj,	34 static ContentViewCore* Create(JNIEnv* env, jobject obj,

35 WebContents* web_contents);	35 WebContents* web_contents);

36 static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);	36 static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);

37	37

	38 // --------------------------------------------------------------------------

	39 // Methods called from Java via JNI
	joth 2012/08/09 00:33:55 these don't need to be in the base class. They are these don't need to be in the base class. They are implementation detail, and can remain non-virtual (and private?) in the impl class. boliu 2012/08/09 01:22:00 Generated ContentViewCore_jni.h uses this through Generated ContentViewCore_jni.h uses this through ContentViewCore, but apparently that can be changed by renaming the definition of the native method in Java. This file is no longer modified in this CL.
	40 // --------------------------------------------------------------------------

	41

	42 virtual void LoadUrl(

	43 JNIEnv* env, jobject obj,

	44 jstring url,

	45 jint load_url_type,

	46 jint transition_type,

	47 jint ua_override_option,

	48 jbyteArray post_data,

	49 jstring base_url_for_data_url,

	50 jstring virtual_url_for_data_url) = 0;

	51

	52 // --------------------------------------------------------------------------

	53 // Methods called from native code
	joth 2012/08/09 00:33:55 this comment shouldn't be needed, as this base cla this comment shouldn't be needed, as this base class interface is only for native code.
	54 // --------------------------------------------------------------------------

	55

	56 virtual void LoadUrl(NavigationController::LoadURLParams& params) = 0;
	joth 2012/08/09 00:33:55 (does LoadUrl actually get called from native? I t (does LoadUrl actually get called from native? I think it's only needed on java side.)
	57

38 protected:	58 protected:

39 virtual ~ContentViewCore() {};	59 virtual ~ContentViewCore() {};

40 };	60 };

41	61

42 }; // namespace content	62 }; // namespace content

43	63

44 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_CORE_H_	64 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_CORE_H_

OLD	NEW