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

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

Issue 589413002: Fix WeakPtrFactory member ordering in ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unwanted header inclusions Created 6 years, 2 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/shadow_controller.cc ('k') | no next file » | 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/aura/window_event_dispatcher.h"
9 #include "ui/compositor/layer.h" 8 #include "ui/compositor/layer.h"
10 #include "ui/compositor/layer_tree_owner.h" 9 #include "ui/compositor/layer_tree_owner.h"
11 #include "ui/wm/core/transient_window_manager.h" 10 #include "ui/wm/core/transient_window_manager.h"
12 #include "ui/wm/public/activation_client.h" 11 #include "ui/wm/public/activation_client.h"
13 12
14 namespace { 13 namespace {
15 14
16 // Invokes RecreateLayer() on all the children of |to_clone|, adding the newly 15 // Invokes RecreateLayer() on all the children of |to_clone|, adding the newly
17 // cloned children to |parent|. 16 // cloned children to |parent|.
18 // 17 //
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 bool HasTransientAncestor(const aura::Window* window, 119 bool HasTransientAncestor(const aura::Window* window,
121 const aura::Window* ancestor) { 120 const aura::Window* ancestor) {
122 const aura::Window* transient_parent = GetTransientParent(window); 121 const aura::Window* transient_parent = GetTransientParent(window);
123 if (transient_parent == ancestor) 122 if (transient_parent == ancestor)
124 return true; 123 return true;
125 return transient_parent ? 124 return transient_parent ?
126 HasTransientAncestor(transient_parent, ancestor) : false; 125 HasTransientAncestor(transient_parent, ancestor) : false;
127 } 126 }
128 127
129 } // namespace wm 128 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/shadow_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698