Index: ui/views/examples/content_client/examples_browser_main_parts.cc |
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc |
index 62d3686e4f448eaa9369b8beefdb8a5884a8cee8..64725ce6de04c5a9847416924685203d89e2dfbf 100644 |
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc |
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc |
@@ -23,39 +23,13 @@ |
#include "ui/views/focus/accelerator_handler.h" |
#if defined(USE_AURA) |
-#include "ui/aura/client/stacking_client.h" |
+#include "ui/aura/desktop/desktop_stacking_client.h" |
#include "ui/aura/env.h" |
-#include "ui/aura/root_window.h" |
-#include "ui/aura/window.h" |
-#include "ui/gfx/compositor/compositor.h" |
-#include "ui/gfx/compositor/test/compositor_test_support.h" |
#include "ui/views/widget/native_widget_aura.h" |
#endif |
namespace views { |
namespace examples { |
-namespace { |
-#if defined(USE_AURA) |
-class RootWindowStackingClient : public aura::client::StackingClient { |
- public: |
- explicit RootWindowStackingClient() { |
- aura::client::SetStackingClient(this); |
- } |
- |
- virtual ~RootWindowStackingClient() { |
- aura::client::SetStackingClient(NULL); |
- } |
- |
- // Overridden from aura::client::StackingClient: |
- virtual aura::Window* GetDefaultParent(aura::Window* window) OVERRIDE { |
- return window->GetRootWindow(); |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(RootWindowStackingClient); |
-}; |
-#endif |
-} |
ExamplesBrowserMainParts::ExamplesBrowserMainParts( |
const content::MainFunctionParams& parameters) |
@@ -79,10 +53,7 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() { |
browser_context_.reset(new content::ShellBrowserContext); |
#if defined(USE_AURA) |
- // TURN ON THE HAX. |
- views::NativeWidgetAura::set_aura_desktop_hax(); |
- ui::CompositorTestSupport::Initialize(); |
- root_window_stacking_client_.reset(new RootWindowStackingClient); |
+ stacking_client_.reset(new aura::DesktopStackingClient); |
#endif |
views_delegate_.reset(new views::TestViewsDelegate); |
@@ -96,9 +67,8 @@ void ExamplesBrowserMainParts::PostMainMessageLoopRun() { |
browser_context_.reset(); |
views_delegate_.reset(); |
#if defined(USE_AURA) |
- root_window_stacking_client_.reset(); |
+ stacking_client_.reset(); |
aura::Env::DeleteInstance(); |
- ui::CompositorTestSupport::Terminate(); |
#endif |
} |