chrome/browser/chromeos/policy/display_rotation_default_handler.h - 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/policy/display_rotation_default_handler.h

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/policy/device_system_use_24hour_clock_browsertest.cc ('k') | chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/display_rotation_default_handler.h

diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler.h b/chrome/browser/chromeos/policy/display_rotation_default_handler.h

index 8c9bcd039ce586b04b1ad9df97e389f1ea8d7de1..eb01c57fb9294637475c822a6f6f8d5b59d03985 100644

--- a/chrome/browser/chromeos/policy/display_rotation_default_handler.h

+++ b/chrome/browser/chromeos/policy/display_rotation_default_handler.h

@@ -7,12 +7,12 @@

#include <stdint.h>

+#include <memory>

#include <set>

#include "ash/display/window_tree_host_manager.h"

#include "ash/shell_observer.h"

#include "base/macros.h"

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

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "ui/gfx/display.h"

@@ -60,7 +60,8 @@ class DisplayRotationDefaultHandler

std::set<int64_t> rotated_displays_;

bool rotation_in_progress_ = false;

- scoped_ptr<chromeos::CrosSettings::ObserverSubscription> settings_observer_;

+ std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>

+ settings_observer_;

DISALLOW_COPY_AND_ASSIGN(DisplayRotationDefaultHandler);

};