chrome/browser/ui/android/toolbar/toolbar_model_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/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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/android/tab_model/tab_model_list_unittest.cc ('k') | chrome/browser/ui/android/website_settings_popup_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/toolbar/toolbar_model_android.h

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

index 5e03bdcea784157b7e504d883f56e24cd0b6374f..3ee6839d46daaf960864f67ab73a00d4e24d2b95 100644

--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.h

+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.h

@@ -5,11 +5,12 @@

#ifndef CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_

#define CHROME_BROWSER_UI_ANDROID_TOOLBAR_TOOLBAR_MODEL_ANDROID_H_

+#include <memory>

#include "base/android/jni_android.h"

#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 "chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h"

#include "components/toolbar/toolbar_model.h"

@@ -39,7 +40,7 @@ class ToolbarModelAndroid : public ChromeToolbarModelDelegate {

static bool RegisterToolbarModelAndroid(JNIEnv* env);

private:

- scoped_ptr<ToolbarModel> toolbar_model_;

+ std::unique_ptr<ToolbarModel> toolbar_model_;

JavaObjectWeakGlobalRef weak_java_delegate_;

DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelAndroid);