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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

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/cocoa/apps/native_app_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
index 2d386376bdef1cc8d58b45f082bd2b54ca4d3757..c3cfb679918a7e9b1bbe661a17d70fc3567626dd 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
@@ -80,9 +80,9 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions(
if (regions.empty()) {
result.push_back(gfx::Rect(0, 0, width, height));
} else {
- scoped_ptr<SkRegion> draggable(
+ std::unique_ptr<SkRegion> draggable(
AppWindow::RawDraggableRegionsToSkRegion(regions));
- scoped_ptr<SkRegion> non_draggable(new SkRegion);
+ std::unique_ptr<SkRegion> non_draggable(new SkRegion);
non_draggable->op(0, 0, width, height, SkRegion::kUnion_Op);
non_draggable->op(*draggable, SkRegion::kDifference_Op);
for (SkRegion::Iterator it(*non_draggable); !it.done(); it.next()) {
@@ -539,7 +539,7 @@ void NativeAppWindowCocoa::UpdateWindowTitle() {
[window() setTitle:base::SysUTF16ToNSString(title)];
}
-void NativeAppWindowCocoa::UpdateShape(scoped_ptr<SkRegion> region) {
+void NativeAppWindowCocoa::UpdateShape(std::unique_ptr<SkRegion> region) {
NOTIMPLEMENTED();
}

Powered by Google App Engine
This is Rietveld 408576698