chrome/browser/ui/webui/options/chromeos/display_options_handler.cc - 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/webui/options/chromeos/display_options_handler.cc

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/webui/options/chromeos/cros_language_options_handler_unittest.cc ('k') | chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

index 45a2d4c0e30197cd98c4596c70447c18b9ede538..29b6fc8fefb9e05b8c3dc2ce4b6dd613d1872171 100644

--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

@@ -304,7 +304,7 @@ void DisplayOptionsHandler::SendAllDisplayInfo() {

base::FundamentalValue mode(static_cast<int>(display_mode));

int64_t primary_id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();

- scoped_ptr<base::ListValue> js_displays(new base::ListValue);

+ std::unique_ptr<base::ListValue> js_displays(new base::ListValue);

for (const gfx::Display& display : displays) {

const ash::DisplayInfo& display_info =

display_manager->GetDisplayInfo(display.id());

@@ -439,7 +439,7 @@ void DisplayOptionsHandler::HandleSetDisplayLayout(

display_id, parent_id,

static_cast<display::DisplayPlacement::Position>(position), offset);

}

- scoped_ptr<display::DisplayLayout> layout = builder.Build();

+ std::unique_ptr<display::DisplayLayout> layout = builder.Build();

if (!display::DisplayLayout::Validate(

display_manager->GetCurrentDisplayIdList(), *layout)) {

LOG(ERROR) << "Invalid layout: " << layout->ToString();