diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 17:59:53 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 17:59:53 +0000 |
| commit | 00e480f9ce8fdd366db92d9839c59f3b5c1624e4 (patch) | |
| tree | 41e95a60ce12b216b4b05e147ebcda08c948239f /content/shell | |
| parent | cbe927e5df57bf2a967101e996142029d6318563 (diff) | |
| download | chromium_src-00e480f9ce8fdd366db92d9839c59f3b5c1624e4.zip chromium_src-00e480f9ce8fdd366db92d9839c59f3b5c1624e4.tar.gz chromium_src-00e480f9ce8fdd366db92d9839c59f3b5c1624e4.tar.bz2 | |
Move aura/desktop to views/widget/desktop_aura
http://crbug.com/158115
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/11312194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_aura.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index fa58914..47fedeb 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" -#include "ui/aura/desktop/desktop_screen.h" #include "ui/aura/display_manager.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" @@ -25,6 +24,7 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/view.h" #include "ui/views/test/desktop_test_views_delegate.h" +#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -33,7 +33,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "content/shell/shell_stacking_client_ash.h" #else -#include "ui/aura/desktop/desktop_stacking_client.h" +#include "ui/views/widget/desktop_aura/desktop_stacking_client.h" #endif // ViewDelegate implementation for aura content shell @@ -289,9 +289,9 @@ void Shell::PlatformInitialize() { gfx::Screen::SetScreenInstance( gfx::SCREEN_TYPE_NATIVE, new ash::ScreenAsh); #else - stacking_client_ = new aura::DesktopStackingClient(); + stacking_client_ = new views::DesktopStackingClient(); gfx::Screen::SetScreenInstance( - gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen()); + gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen()); #endif views_delegate_ = new ShellViewsDelegateAura(); } |