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

Side by Side Diff: ui/wm/core/window_util.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 unified diff | Download patch
« no previous file with comments | « ui/wm/core/window_util.h ('k') | ui/wm/core/window_util_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/wm/core/window_util.h" 5 #include "ui/wm/core/window_util.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "ui/compositor/layer.h" 8 #include "ui/compositor/layer.h"
9 #include "ui/compositor/layer_tree_owner.h" 9 #include "ui/compositor/layer_tree_owner.h"
10 #include "ui/wm/core/transient_window_manager.h" 10 #include "ui/wm/core/transient_window_manager.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 aura::client::GetActivationClient(window->GetRootWindow()); 73 aura::client::GetActivationClient(window->GetRootWindow());
74 return client ? client->GetActivatableWindow(window) : NULL; 74 return client ? client->GetActivatableWindow(window) : NULL;
75 } 75 }
76 76
77 aura::Window* GetToplevelWindow(aura::Window* window) { 77 aura::Window* GetToplevelWindow(aura::Window* window) {
78 aura::client::ActivationClient* client = 78 aura::client::ActivationClient* client =
79 aura::client::GetActivationClient(window->GetRootWindow()); 79 aura::client::GetActivationClient(window->GetRootWindow());
80 return client ? client->GetToplevelWindow(window) : NULL; 80 return client ? client->GetToplevelWindow(window) : NULL;
81 } 81 }
82 82
83 scoped_ptr<ui::LayerTreeOwner> RecreateLayers(ui::LayerOwner* root) { 83 std::unique_ptr<ui::LayerTreeOwner> RecreateLayers(ui::LayerOwner* root) {
84 scoped_ptr<ui::LayerTreeOwner> old_layer( 84 std::unique_ptr<ui::LayerTreeOwner> old_layer(
85 new ui::LayerTreeOwner(root->RecreateLayer().release())); 85 new ui::LayerTreeOwner(root->RecreateLayer().release()));
86 if (old_layer->root()) 86 if (old_layer->root())
87 CloneChildren(root->layer(), old_layer->root()); 87 CloneChildren(root->layer(), old_layer->root());
88 return old_layer; 88 return old_layer;
89 } 89 }
90 90
91 aura::Window* GetTransientParent(aura::Window* window) { 91 aura::Window* GetTransientParent(aura::Window* window) {
92 return const_cast<aura::Window*>(GetTransientParent( 92 return const_cast<aura::Window*>(GetTransientParent(
93 const_cast<const aura::Window*>(window))); 93 const_cast<const aura::Window*>(window)));
94 } 94 }
(...skipping 24 matching lines...) Expand all
119 bool HasTransientAncestor(const aura::Window* window, 119 bool HasTransientAncestor(const aura::Window* window,
120 const aura::Window* ancestor) { 120 const aura::Window* ancestor) {
121 const aura::Window* transient_parent = GetTransientParent(window); 121 const aura::Window* transient_parent = GetTransientParent(window);
122 if (transient_parent == ancestor) 122 if (transient_parent == ancestor)
123 return true; 123 return true;
124 return transient_parent ? 124 return transient_parent ?
125 HasTransientAncestor(transient_parent, ancestor) : false; 125 HasTransientAncestor(transient_parent, ancestor) : false;
126 } 126 }
127 127
128 } // namespace wm 128 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/window_util.h ('k') | ui/wm/core/window_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698