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

Side by Side Diff: chrome/browser/ui/android/toolbar/toolbar_model_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_
7 7
8 #include <memory>
9
8 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
9 #include "base/android/jni_weak_ref.h" 11 #include "base/android/jni_weak_ref.h"
10 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h" 14 #include "chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h"
14 #include "components/toolbar/toolbar_model.h" 15 #include "components/toolbar/toolbar_model.h"
15 16
16 namespace content { 17 namespace content {
17 class WebContents; 18 class WebContents;
18 } // content 19 } // content
19 20
20 // Owns a ToolbarModel and provides a way for Java to interact with it. 21 // Owns a ToolbarModel and provides a way for Java to interact with it.
21 class ToolbarModelAndroid : public ChromeToolbarModelDelegate { 22 class ToolbarModelAndroid : public ChromeToolbarModelDelegate {
22 public: 23 public:
23 explicit ToolbarModelAndroid(JNIEnv* env, jobject jdelegate); 24 explicit ToolbarModelAndroid(JNIEnv* env, jobject jdelegate);
24 ~ToolbarModelAndroid() override; 25 ~ToolbarModelAndroid() override;
25 26
26 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 27 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
27 base::android::ScopedJavaLocalRef<jstring> GetText( 28 base::android::ScopedJavaLocalRef<jstring> GetText(
28 JNIEnv* env, 29 JNIEnv* env,
29 const base::android::JavaParamRef<jobject>& obj); 30 const base::android::JavaParamRef<jobject>& obj);
30 base::android::ScopedJavaLocalRef<jstring> GetCorpusChipText( 31 base::android::ScopedJavaLocalRef<jstring> GetCorpusChipText(
31 JNIEnv* env, 32 JNIEnv* env,
32 const base::android::JavaParamRef<jobject>& obj); 33 const base::android::JavaParamRef<jobject>& obj);
33 jboolean WouldReplaceURL(JNIEnv* env, 34 jboolean WouldReplaceURL(JNIEnv* env,
34 const base::android::JavaParamRef<jobject>& obj); 35 const base::android::JavaParamRef<jobject>& obj);
35 36
36 // ChromeToolbarModelDelegate: 37 // ChromeToolbarModelDelegate:
37 content::WebContents* GetActiveWebContents() const override; 38 content::WebContents* GetActiveWebContents() const override;
38 39
39 static bool RegisterToolbarModelAndroid(JNIEnv* env); 40 static bool RegisterToolbarModelAndroid(JNIEnv* env);
40 41
41 private: 42 private:
42 scoped_ptr<ToolbarModel> toolbar_model_; 43 std::unique_ptr<ToolbarModel> toolbar_model_;
43 JavaObjectWeakGlobalRef weak_java_delegate_; 44 JavaObjectWeakGlobalRef weak_java_delegate_;
44 45
45 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid); 46 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid);
46 }; 47 };
47 48
48 #endif // CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_ 49 #endif // CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698