chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h - Issue 10907166: Upstream chromium side of modal dialogs for webview.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

Issue 10907166: Upstream chromium side of modal dialogs for webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

diff --git a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

index 84c75de5c989f73d6eb1a8e963a4c0db8e4160b3..6cbc2169b143e4c1057f4e965a1616e8c81c6412 100644

--- a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

+++ b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

@@ -103,15 +103,8 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {

virtual void HandleKeyboardEvent(

content::WebContents* source,

const content::NativeWebKeyboardEvent& event) OVERRIDE;

- virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator()

- OVERRIDE;

virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;

- void SetJavaScriptDialogCreator(

- content::JavaScriptDialogCreator* javascript_dialog_creator) {

- javascript_dialog_creator_ = javascript_dialog_creator;

- }

protected:

base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const;

@@ -120,9 +113,6 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {

// strong reference to that object as long as they want to receive callbacks

// on it. Using a weak ref here allows it to be correctly GCed.

JavaObjectWeakGlobalRef weak_java_delegate_;

- // The object responsible for creating JavaScript dialogs.

- content::JavaScriptDialogCreator* javascript_dialog_creator_;

};

bool RegisterWebContentsDelegateAndroid(JNIEnv* env);