chrome/browser/ui/android/javascript_app_modal_dialog_android.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/android/infobars/update_password_infobar.cc ('k') | chrome/browser/ui/android/javascript_app_modal_dialog_android.cc » ('j') | no next file with comments »
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 723b18614f233c34d09990997c3bdf67c2e8679d..e0f69d2b784a1e7321bc830e92453d22195cc5ef 100644

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

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

@@ -5,10 +5,11 @@

#ifndef CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_

#define CHROME_BROWSER_UI_ANDROID_JAVASCRIPT_APP_MODAL_DIALOG_ANDROID_H_

+#include <memory>

#include "base/android/jni_weak_ref.h"

#include "base/android/scoped_java_ref.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "components/app_modal/native_app_modal_dialog.h"

class JavaScriptAppModalDialog;

@@ -48,7 +49,7 @@ class JavascriptAppModalDialogAndroid

// The object deletes itself.

~JavascriptAppModalDialogAndroid() override;

- scoped_ptr<app_modal::JavaScriptAppModalDialog> dialog_;

+ std::unique_ptr<app_modal::JavaScriptAppModalDialog> dialog_;

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

JavaObjectWeakGlobalRef parent_jobject_weak_ref_;