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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.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
Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
index 17463420ab1a31081d5c1a7e0543bcaf6b4ea2b3..22b3aeac4edf5f6ecad334956634c90f01f28e71 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -86,7 +86,7 @@ ChromeNativeAppWindowViewsAura::CreateNonStandardAppFrame() {
// window. The root window does not have a delegate, which is needed to
// handle the event in Linux.
window->SetEventTargeter(
- scoped_ptr<ui::EventTargeter>(new AppWindowEasyResizeWindowTargeter(
+ std::unique_ptr<ui::EventTargeter>(new AppWindowEasyResizeWindowTargeter(
window, gfx::Insets(frame->resize_inside_bounds_size()), this)));
return frame;
@@ -118,16 +118,17 @@ bool ChromeNativeAppWindowViewsAura::IsAlwaysOnTop() const {
return widget()->IsAlwaysOnTop();
}
-void ChromeNativeAppWindowViewsAura::UpdateShape(scoped_ptr<SkRegion> region) {
+void ChromeNativeAppWindowViewsAura::UpdateShape(
+ std::unique_ptr<SkRegion> region) {
bool had_shape = !!shape();
ChromeNativeAppWindowViews::UpdateShape(std::move(region));
aura::Window* native_window = widget()->GetNativeWindow();
if (shape() && !had_shape) {
- native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
+ native_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
new ShapedAppWindowTargeter(native_window, this)));
} else if (!shape() && had_shape) {
- native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>());
+ native_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>());
}
}

Powered by Google App Engine
This is Rietveld 408576698