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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/aura/stacking_client_aura.cc
diff --git a/chrome/browser/ui/aura/stacking_client_aura.cc b/chrome/browser/ui/aura/stacking_client_aura.cc
deleted file mode 100644
index e2e70e4bd0b96d5a3a4209375d4490c16e81a85c..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/aura/stacking_client_aura.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/aura/stacking_client_aura.h"
-
-#include "ash/shell.h"
-#include "ash/wm/stacking_controller.h"
-#include "ui/aura/focus_manager.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#include "ui/views/widget/desktop_aura/desktop_stacking_client.h"
-
-StackingClientAura::StackingClientAura() {
- desktop_stacking_client_.reset(new views::DesktopStackingClient);
-}
-
-StackingClientAura::~StackingClientAura() {
-}
-
-aura::Window* StackingClientAura::GetDefaultParent(aura::Window* context,
- aura::Window* window,
- const gfx::Rect& bounds) {
-#if defined(USE_ASH)
- if (chrome::GetHostDesktopTypeForNativeView(context) ==
- chrome::HOST_DESKTOP_TYPE_ASH) {
- return ash::Shell::GetInstance()->stacking_client()->GetDefaultParent(
- context, window, bounds);
- }
-#endif
- return desktop_stacking_client_->GetDefaultParent(context, window, bounds);
-}
« 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