chrome/browser/chromeos/accessibility/magnification_manager.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/accessibility/magnification_manager.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/accessibility/chromevox_panel.h ('k') | chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/accessibility/magnification_manager.cc

diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc

index 78f4a339d89d67063c96a7b9819e53aef3438ebc..d3923ef2f2ed8d04777ae736c96f39d03b157216 100644

--- a/chrome/browser/chromeos/accessibility/magnification_manager.cc

+++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

#include <limits>

+#include <memory>

#include "ash/magnifier/magnification_controller.h"

#include "ash/magnifier/partial_magnification_controller.h"

@@ -13,7 +14,6 @@

#include "ash/shell_delegate.h"

#include "ash/system/tray/system_tray_notifier.h"

#include "base/macros.h"

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

#include "base/memory/singleton.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

@@ -296,8 +296,8 @@ class MagnificationManagerImpl : public MagnificationManager,

bool observing_focus_change_in_page_;

content::NotificationRegistrar registrar_;

- scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;

- scoped_ptr<ash::ScopedSessionStateObserver> session_state_observer_;

+ std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;

+ std::unique_ptr<ash::ScopedSessionStateObserver> session_state_observer_;

DISALLOW_COPY_AND_ASSIGN(MagnificationManagerImpl);

};