diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 20:53:27 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 20:53:27 +0000 |
| commit | 17eae598cc52d3cd95597c07dc35469369c59010 (patch) | |
| tree | d8819cf216863ddcf94928ae647ab566016c7b71 /content/shell/browser/shell_aura.cc | |
| parent | 4b2f65784504669a14cf7d93a9b97bcc81ab62a3 (diff) | |
| download | chromium_src-17eae598cc52d3cd95597c07dc35469369c59010.zip chromium_src-17eae598cc52d3cd95597c07dc35469369c59010.tar.gz chromium_src-17eae598cc52d3cd95597c07dc35469369c59010.tar.bz2 | |
Move MinimalShell to ui/shell.
Move the MinimalShell class from content to a new "shell"
library so it can be shared by app_shell. Also move
aura::test::TestActivationClient to
aura::client::DefaultActivationClient.
BUG=305404
Review URL: https://codereview.chromium.org/26699003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell_aura.cc')
| -rw-r--r-- | content/shell/browser/shell_aura.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc index da8460e..7d8309a 100644 --- a/content/shell/browser/shell_aura.cc +++ b/content/shell/browser/shell_aura.cc @@ -30,8 +30,8 @@ #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" -#include "content/shell/browser/minimal_shell.h" #include "ui/aura/test/test_screen.h" +#include "ui/shell/minimal_shell.h" #endif #if defined(OS_WIN) @@ -278,7 +278,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView, } // namespace #if defined(OS_CHROMEOS) -MinimalShell* Shell::minimal_shell_ = NULL; +shell::MinimalShell* Shell::minimal_shell_ = NULL; #endif views::ViewsDelegate* Shell::views_delegate_ = NULL; @@ -292,7 +292,7 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) { chromeos::DBusThreadManager::Initialize(); gfx::Screen::SetScreenInstance( gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create()); - minimal_shell_ = new content::MinimalShell(default_window_size); + minimal_shell_ = new shell::MinimalShell(default_window_size); #else gfx::Screen::SetScreenInstance( gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen()); |