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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/window.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« base/memory/scoped_ptr.h ('K') | « ui/app_list/app_list_item_list_unittest.cc ('k') | ui/views/bubble/bubble_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 6ff6c762a6cea14f20cd3ba7ceddba6f4863e2d8..c97941d1fd5e22665576b95301209b6264ef0a1e 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -276,7 +276,7 @@ void Window::SetTransform(const gfx::Transform& transform) {
}
void Window::SetLayoutManager(LayoutManager* layout_manager) {
- if (layout_manager == layout_manager_)
+ if (layout_manager == layout_manager_.get())
return;
layout_manager_.reset(layout_manager);
if (!layout_manager)
« base/memory/scoped_ptr.h ('K') | « ui/app_list/app_list_item_list_unittest.cc ('k') | ui/views/bubble/bubble_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698