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

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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "chrome/browser/ui/aura/stacking_client_aura.h"
6
7 #include "ash/shell.h"
8 #include "ash/wm/stacking_controller.h"
9 #include "ui/aura/focus_manager.h"
10 #include "ui/aura/root_window.h"
11 #include "ui/aura/window.h"
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
13 #include "ui/views/widget/desktop_aura/desktop_stacking_client.h"
14
15 StackingClientAura::StackingClientAura() {
16 desktop_stacking_client_.reset(new views::DesktopStackingClient);
17 }
18
19 StackingClientAura::~StackingClientAura() {
20 }
21
22 aura::Window* StackingClientAura::GetDefaultParent(aura::Window* context,
23 aura::Window* window,
24 const gfx::Rect& bounds) {
25 #if defined(USE_ASH)
26 if (chrome::GetHostDesktopTypeForNativeView(context) ==
27 chrome::HOST_DESKTOP_TYPE_ASH) {
28 return ash::Shell::GetInstance()->stacking_client()->GetDefaultParent(
29 context, window, bounds);
30 }
31 #endif
32 return desktop_stacking_client_->GetDefaultParent(context, window, bounds);
33 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/aura/stacking_client_aura.h ('k') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698