Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(556)

Unified Diff: ash/display/display_configuration_controller.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/display/display_configuration_controller.h ('k') | ash/display/display_error_observer_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_configuration_controller.cc
diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc
index 3110858b6f02ed20bc471fbbd3fae49ba28c0b85..d5f57a9c277427038c32542e21a6600d9ee2cc4d 100644
--- a/ash/display/display_configuration_controller.cc
+++ b/ash/display/display_configuration_controller.cc
@@ -68,7 +68,7 @@ DisplayConfigurationController::~DisplayConfigurationController() {
}
void DisplayConfigurationController::SetDisplayLayout(
- scoped_ptr<display::DisplayLayout> layout,
+ std::unique_ptr<display::DisplayLayout> layout,
bool user_action) {
if (user_action && display_animator_) {
display_animator_->StartFadeOutAnimation(
@@ -147,7 +147,7 @@ bool DisplayConfigurationController::IsLimited() {
}
void DisplayConfigurationController::SetDisplayLayoutImpl(
- scoped_ptr<display::DisplayLayout> layout) {
+ std::unique_ptr<display::DisplayLayout> layout) {
// TODO(oshima/stevenjb): Add support for 3+ displays.
display_manager_->SetLayoutForCurrentDisplays(std::move(layout));
if (display_animator_)
« no previous file with comments | « ash/display/display_configuration_controller.h ('k') | ash/display/display_error_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698