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

Side by Side 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: scopedptrequals: followupfix-after-rebase 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 unified diff | Download patch
« no previous file with comments | « ui/app_list/app_list_item_list_unittest.cc ('k') | ui/views/bubble/bubble_delegate_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/window.h" 5 #include "ui/aura/window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 void Window::SetTransform(const gfx::Transform& transform) { 269 void Window::SetTransform(const gfx::Transform& transform) {
270 FOR_EACH_OBSERVER(WindowObserver, observers_, 270 FOR_EACH_OBSERVER(WindowObserver, observers_,
271 OnWindowTransforming(this)); 271 OnWindowTransforming(this));
272 layer()->SetTransform(transform); 272 layer()->SetTransform(transform);
273 FOR_EACH_OBSERVER(WindowObserver, observers_, 273 FOR_EACH_OBSERVER(WindowObserver, observers_,
274 OnWindowTransformed(this)); 274 OnWindowTransformed(this));
275 NotifyAncestorWindowTransformed(this); 275 NotifyAncestorWindowTransformed(this);
276 } 276 }
277 277
278 void Window::SetLayoutManager(LayoutManager* layout_manager) { 278 void Window::SetLayoutManager(LayoutManager* layout_manager) {
279 if (layout_manager == layout_manager_) 279 if (layout_manager == layout_manager_.get())
280 return; 280 return;
281 layout_manager_.reset(layout_manager); 281 layout_manager_.reset(layout_manager);
282 if (!layout_manager) 282 if (!layout_manager)
283 return; 283 return;
284 // If we're changing to a new layout manager, ensure it is aware of all the 284 // If we're changing to a new layout manager, ensure it is aware of all the
285 // existing child windows. 285 // existing child windows.
286 for (Windows::const_iterator it = children_.begin(); 286 for (Windows::const_iterator it = children_.begin();
287 it != children_.end(); 287 it != children_.end();
288 ++it) 288 ++it)
289 layout_manager_->OnWindowAddedToLayout(*it); 289 layout_manager_->OnWindowAddedToLayout(*it);
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 layer_name = "Unnamed Window"; 1108 layer_name = "Unnamed Window";
1109 1109
1110 if (id_ != -1) 1110 if (id_ != -1)
1111 layer_name += " " + base::IntToString(id_); 1111 layer_name += " " + base::IntToString(id_);
1112 1112
1113 layer()->set_name(layer_name); 1113 layer()->set_name(layer_name);
1114 #endif 1114 #endif
1115 } 1115 }
1116 1116
1117 } // namespace aura 1117 } // namespace aura
OLDNEW
« no previous file with comments | « 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