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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
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 <memory>
9
8 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
9 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "components/app_modal/native_app_modal_dialog.h" 13 #include "components/app_modal/native_app_modal_dialog.h"
13 14
14 class JavaScriptAppModalDialog; 15 class JavaScriptAppModalDialog;
15 16
16 class JavascriptAppModalDialogAndroid 17 class JavascriptAppModalDialogAndroid
17 : public app_modal::NativeAppModalDialog { 18 : public app_modal::NativeAppModalDialog {
18 public: 19 public:
19 JavascriptAppModalDialogAndroid( 20 JavascriptAppModalDialogAndroid(
20 JNIEnv* env, 21 JNIEnv* env,
21 app_modal::JavaScriptAppModalDialog* dialog, 22 app_modal::JavaScriptAppModalDialog* dialog,
(...skipping 19 matching lines...) Expand all
41 bool suppress_js_dialogs); 42 bool suppress_js_dialogs);
42 43
43 const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const; 44 const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const;
44 45
45 static bool RegisterJavascriptAppModalDialog(JNIEnv* env); 46 static bool RegisterJavascriptAppModalDialog(JNIEnv* env);
46 47
47 private: 48 private:
48 // The object deletes itself. 49 // The object deletes itself.
49 ~JavascriptAppModalDialogAndroid() override; 50 ~JavascriptAppModalDialogAndroid() override;
50 51
51 scoped_ptr<app_modal::JavaScriptAppModalDialog> dialog_; 52 std::unique_ptr<app_modal::JavaScriptAppModalDialog> dialog_;
52 base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_; 53 base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_;
53 JavaObjectWeakGlobalRef parent_jobject_weak_ref_; 54 JavaObjectWeakGlobalRef parent_jobject_weak_ref_;
54 55
55 DISALLOW_COPY_AND_ASSIGN(JavascriptAppModalDialogAndroid); 56 DISALLOW_COPY_AND_ASSIGN(JavascriptAppModalDialogAndroid);
56 }; 57 };
57 58
58 59
59 #endif // CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_ 60 #endif // CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698