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

3 files changed, 7 insertions, 4 deletions

diff --git a/apps/shell/DEPS b/apps/shell/DEPS
index d4570d3..8e3a902 100644
--- a/apps/shell/DEPS
+++ b/apps/shell/DEPS
@@ -1,9 +1,9 @@
 include_rules = [
   "-chrome",
+  "+ui/shell",
 
   # Pieces of content_shell reused in app_shell.
   # TODO(jamescook): Remove these. http://crbug.com/305404
-  "+content/shell/browser/minimal_shell.h",
   "+content/shell/browser/shell_browser_context.h",
   "+content/shell/common/shell_content_client.h",
 ]
diff --git a/apps/shell/app_shell_browser_main_parts.cc b/apps/shell/app_shell_browser_main_parts.cc
index db08a5a..c56918d 100644
--- a/apps/shell/app_shell_browser_main_parts.cc
+++ b/apps/shell/app_shell_browser_main_parts.cc
@@ -7,11 +7,11 @@
 #include "apps/shell/web_view_window.h"
 #include "base/run_loop.h"
 #include "content/public/common/result_codes.h"
-#include "content/shell/browser/minimal_shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_screen.h"
+#include "ui/shell/minimal_shell.h"
 
 namespace apps {
 
@@ -42,7 +42,7 @@ void AppShellBrowserMainParts::PreMainMessageLoopRun() {
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
   // Set up basic pieces of views::corewm.
-  minimal_shell_.reset(new content::MinimalShell(gfx::Size(800, 600)));
+  minimal_shell_.reset(new shell::MinimalShell(gfx::Size(800, 600)));
   // Ensure the X window gets mapped.
   minimal_shell_->root_window()->ShowRootWindow();
 
diff --git a/apps/shell/app_shell_browser_main_parts.h b/apps/shell/app_shell_browser_main_parts.h
index 8bde9e3..bcbfa8f 100644
--- a/apps/shell/app_shell_browser_main_parts.h
+++ b/apps/shell/app_shell_browser_main_parts.h
@@ -13,6 +13,9 @@
 namespace content {
 class ShellBrowserContext;
 struct MainFunctionParams;
+}
+
+namespace shell {
 class MinimalShell;
 }
 
@@ -45,7 +48,7 @@ class AppShellBrowserMainParts : public content::BrowserMainParts {
   scoped_ptr<content::ShellBrowserContext> browser_context_;
 
   // Enable a minimal set of views::corewm to be initialized.
-  scoped_ptr<content::MinimalShell> minimal_shell_;
+  scoped_ptr<shell::MinimalShell> minimal_shell_;
 
   DISALLOW_COPY_AND_ASSIGN(AppShellBrowserMainParts);
 };