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

Side by Side Diff: chrome/browser/ui/android/javascript_app_modal_dialog_android.h

Issue 11728004: Fix use after free in JavascriptAppModalDialogAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing 'virtual' (only needed by the Chromium style Clang plugin) Created 7 years, 11 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 | Annotate | Revision Log
OLDNEW
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 CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_
7 7
8 #include "base/android/jni_helper.h" 8 #include "base/android/jni_helper.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" 11 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
12 12
13 class JavaScriptAppModalDialog; 13 class JavaScriptAppModalDialog;
14 14
15 class JavascriptAppModalDialogAndroid : public NativeAppModalDialog { 15 class JavascriptAppModalDialogAndroid : public NativeAppModalDialog {
16 public: 16 public:
17 JavascriptAppModalDialogAndroid(JNIEnv* env, 17 JavascriptAppModalDialogAndroid(JNIEnv* env,
18 JavaScriptAppModalDialog* dialog, 18 JavaScriptAppModalDialog* dialog,
19 gfx::NativeWindow parent); 19 gfx::NativeWindow parent);
20 virtual ~JavascriptAppModalDialogAndroid();
21 20
22 // NativeAppModalDialog: 21 // NativeAppModalDialog:
23 virtual int GetAppModalDialogButtons() const OVERRIDE; 22 virtual int GetAppModalDialogButtons() const OVERRIDE;
24 virtual void ShowAppModalDialog() OVERRIDE; 23 virtual void ShowAppModalDialog() OVERRIDE;
25 virtual void ActivateAppModalDialog() OVERRIDE; 24 virtual void ActivateAppModalDialog() OVERRIDE;
26 virtual void CloseAppModalDialog() OVERRIDE; 25 virtual void CloseAppModalDialog() OVERRIDE;
27 virtual void AcceptAppModalDialog() OVERRIDE; 26 virtual void AcceptAppModalDialog() OVERRIDE;
28 virtual void CancelAppModalDialog() OVERRIDE; 27 virtual void CancelAppModalDialog() OVERRIDE;
29 28
30 // Called when java confirms or cancels the dialog. 29 // Called when java confirms or cancels the dialog.
31 void DidAcceptAppModalDialog(JNIEnv* env, 30 void DidAcceptAppModalDialog(JNIEnv* env,
32 jobject obj, 31 jobject obj,
33 jstring prompt_text, 32 jstring prompt_text,
34 bool suppress_js_dialogs); 33 bool suppress_js_dialogs);
35 void DidCancelAppModalDialog(JNIEnv* env, jobject, bool suppress_js_dialogs); 34 void DidCancelAppModalDialog(JNIEnv* env, jobject, bool suppress_js_dialogs);
36 35
37 const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const; 36 const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const;
38 37
39 static bool RegisterJavascriptAppModalDialog(JNIEnv* env); 38 static bool RegisterJavascriptAppModalDialog(JNIEnv* env);
40 39
41 private: 40 private:
41 // The object deletes itself.
42 virtual ~JavascriptAppModalDialogAndroid();
43
42 scoped_ptr<JavaScriptAppModalDialog> dialog_; 44 scoped_ptr<JavaScriptAppModalDialog> dialog_;
43 base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_; 45 base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_;
44 JavaObjectWeakGlobalRef parent_jobject_weak_ref_; 46 JavaObjectWeakGlobalRef parent_jobject_weak_ref_;
45 47
46 DISALLOW_COPY_AND_ASSIGN(JavascriptAppModalDialogAndroid); 48 DISALLOW_COPY_AND_ASSIGN(JavascriptAppModalDialogAndroid);
47 }; 49 };
48 50
49 51
50 #endif // CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_ 52 #endif // CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698