components/sync_driver/device_info_model_type_controller.h - Issue 1907683003: Convert //components/sync_driver 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: components/sync_driver/device_info_model_type_controller.h

Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Build fix, address feedback 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 | « components/sync_driver/device_info_data_type_controller_unittest.cc ('k') | components/sync_driver/device_info_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/device_info_model_type_controller.h

diff --git a/components/sync_driver/device_info_model_type_controller.h b/components/sync_driver/device_info_model_type_controller.h

index fb189589318551bbfb58d54b00ecfa743c76b082..e1485b9f7739b128c1225e53f82e1daf8e5771fd 100644

--- a/components/sync_driver/device_info_model_type_controller.h

+++ b/components/sync_driver/device_info_model_type_controller.h

@@ -5,7 +5,8 @@

#ifndef COMPONENTS_SYNC_DRIVER_DEVICE_INFO_MODEL_TYPE_CONTROLLER_H_

#define COMPONENTS_SYNC_DRIVER_DEVICE_INFO_MODEL_TYPE_CONTROLLER_H_

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

+#include <memory>

#include "components/sync_driver/local_device_info_provider.h"

#include "components/sync_driver/ui_model_type_controller.h"

@@ -29,7 +30,8 @@ class DeviceInfoModelTypeController : public UIModelTypeController {

~DeviceInfoModelTypeController() override;

sync_driver::LocalDeviceInfoProvider* const local_device_info_provider_;

- scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription> subscription_;

+ std::unique_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>

+ subscription_;

DISALLOW_COPY_AND_ASSIGN(DeviceInfoModelTypeController);

};