chrome/browser/ui/aura/stacking_client_aura.cc - Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/aura/stacking_client_aura.cc

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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:

OLD	NEW
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 "chrome/browser/ui/aura/stacking_client_aura.h"	5 #include "chrome/browser/ui/aura/stacking_client_aura.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/wm/stacking_controller.h"	8 #include "ash/wm/stacking_controller.h"

9 #include "ui/aura/focus_manager.h"	9 #include "ui/aura/focus_manager.h"

10 #include "ui/aura/root_window.h"	10 #include "ui/aura/root_window.h"

(...skipping 13 matching lines...) Expand all Loading...
24 const gfx::Rect& bounds) {	24 const gfx::Rect& bounds) {

25 #if defined(USE_ASH)	25 #if defined(USE_ASH)

26 if (chrome::GetHostDesktopTypeForNativeView(context) ==	26 if (chrome::GetHostDesktopTypeForNativeView(context) ==

27 chrome::HOST_DESKTOP_TYPE_ASH) {	27 chrome::HOST_DESKTOP_TYPE_ASH) {

28 return ash::Shell::GetInstance()->stacking_client()->GetDefaultParent(	28 return ash::Shell::GetInstance()->stacking_client()->GetDefaultParent(

29 context, window, bounds);	29 context, window, bounds);

30 }	30 }

31 #endif	31 #endif

32 return desktop_stacking_client_->GetDefaultParent(context, window, bounds);	32 return desktop_stacking_client_->GetDefaultParent(context, window, bounds);

33 }	33 }

OLD	NEW