chrome/browser/ui/android/javascript_app_modal_dialog_android.h - Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

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/ui/android/javascript_app_modal_dialog_android.h

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/lifetime/browser_close_manager_browsertest.cc ('k') | chrome/browser/ui/android/javascript_app_modal_dialog_android.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/javascript_app_modal_dialog_android.h

diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h

index af2ede5c6c02770a7ae0f1d9d3b45df3c4d523a9..db85777511d6fa6f4f1816d86b10a92b8f5959d7 100644

--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h

+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h

@@ -12,11 +12,13 @@

class JavaScriptAppModalDialog;

-class JavascriptAppModalDialogAndroid : public NativeAppModalDialog {

+class JavascriptAppModalDialogAndroid

+ : public app_modal_dialogs::NativeAppModalDialog {

public:

- JavascriptAppModalDialogAndroid(JNIEnv* env,

- JavaScriptAppModalDialog* dialog,

- gfx::NativeWindow parent);

+ JavascriptAppModalDialogAndroid(

+ JNIEnv* env,

+ app_modal_dialogs::JavaScriptAppModalDialog* dialog,

+ gfx::NativeWindow parent);

// NativeAppModalDialog:

virtual int GetAppModalDialogButtons() const override;

@@ -41,7 +43,7 @@ class JavascriptAppModalDialogAndroid : public NativeAppModalDialog {

// The object deletes itself.

virtual ~JavascriptAppModalDialogAndroid();

- scoped_ptr<JavaScriptAppModalDialog> dialog_;

+ scoped_ptr<app_modal_dialogs::JavaScriptAppModalDialog> dialog_;

base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_;

JavaObjectWeakGlobalRef parent_jobject_weak_ref_;