summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/apps.gypi2
-rw-r--r--apps/shell/app_shell_browser_main_parts.cc4
-rw-r--r--apps/shell/app_shell_browser_main_parts.h10
-rw-r--r--content/content_shell.gypi2
-rw-r--r--content/shell/DEPS2
-rw-r--r--content/shell/browser/shell.h8
-rw-r--r--content/shell/browser/shell_views.cc6
-rw-r--r--ui/shell/README.chromium2
-rw-r--r--ui/views/DEPS2
-rw-r--r--ui/views/examples/content_client/examples_browser_main_parts.cc4
-rw-r--r--ui/views/examples/content_client/examples_browser_main_parts.h4
-rw-r--r--ui/views/views.gyp2
-rw-r--r--ui/wm/README.chromium8
-rw-r--r--ui/wm/test/DEPS (renamed from ui/shell/DEPS)0
-rw-r--r--ui/wm/test/minimal_shell.cc (renamed from ui/shell/minimal_shell.cc)6
-rw-r--r--ui/wm/test/minimal_shell.h (renamed from ui/shell/minimal_shell.h)10
-rw-r--r--ui/wm/wm.gyp (renamed from ui/shell/shell.gyp)6
17 files changed, 42 insertions, 36 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi
index c6dc3ab..0d788c9 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -112,8 +112,8 @@
'../content/content.gyp:content',
'../content/content_shell_and_tests.gyp:content_shell_lib',
'../skia/skia.gyp:skia',
- '../ui/shell/shell.gyp:shell',
'../ui/views/views.gyp:views',
+ '../ui/wm/wm.gyp:wm_test_support',
],
'include_dirs': [
'..',
diff --git a/apps/shell/app_shell_browser_main_parts.cc b/apps/shell/app_shell_browser_main_parts.cc
index 8a369df..5c9000d 100644
--- a/apps/shell/app_shell_browser_main_parts.cc
+++ b/apps/shell/app_shell_browser_main_parts.cc
@@ -11,7 +11,7 @@
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_screen.h"
-#include "ui/shell/minimal_shell.h"
+#include "ui/wm/test/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 shell::MinimalShell(gfx::Size(800, 600)));
+ minimal_shell_.reset(new wm::MinimalShell(gfx::Size(800, 600)));
// Ensure the X window gets mapped.
minimal_shell_->root_window()->host()->Show();
diff --git a/apps/shell/app_shell_browser_main_parts.h b/apps/shell/app_shell_browser_main_parts.h
index bcbfa8f..b32c715 100644
--- a/apps/shell/app_shell_browser_main_parts.h
+++ b/apps/shell/app_shell_browser_main_parts.h
@@ -15,14 +15,14 @@ class ShellBrowserContext;
struct MainFunctionParams;
}
-namespace shell {
-class MinimalShell;
-}
-
namespace views {
class ViewsDelegate;
}
+namespace wm {
+class MinimalShell;
+}
+
namespace apps {
// Handles initialization of AppShell.
@@ -48,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<shell::MinimalShell> minimal_shell_;
+ scoped_ptr<wm::MinimalShell> minimal_shell_;
DISALLOW_COPY_AND_ASSIGN(AppShellBrowserMainParts);
};
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 9d73768..908a62a 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -257,7 +257,7 @@
['chromeos==1', {
'dependencies': [
'../chromeos/chromeos.gyp:chromeos',
- '../ui/shell/shell.gyp:shell',
+ '../ui/wm/wm.gyp:wm_test_support',
],
}], # chromeos==1
['use_custom_freetype==1', {
diff --git a/content/shell/DEPS b/content/shell/DEPS
index 3738104..3cc264e 100644
--- a/content/shell/DEPS
+++ b/content/shell/DEPS
@@ -28,6 +28,6 @@ include_rules = [
specific_include_rules = {
"shell_views\.cc": [
- "+ui/shell"
+ "+ui/wm/test"
],
}
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index c5bfddb..fdc3f48 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -27,14 +27,14 @@ typedef struct _GtkToolItem GtkToolItem;
#include "base/android/scoped_java_ref.h"
#elif defined(USE_AURA)
#if defined(OS_CHROMEOS)
-namespace shell {
+namespace wm {
class MinimalShell;
-} // namespace shell
+}
#endif // defined(OS_CHROMEOS)
namespace views {
class Widget;
class ViewsDelegate;
-} // namespace views
+}
#endif // defined(USE_AURA)
class GURL;
@@ -262,7 +262,7 @@ class Shell : public WebContentsDelegate,
base::android::ScopedJavaGlobalRef<jobject> java_object_;
#elif defined(USE_AURA)
#if defined(OS_CHROMEOS)
- static shell::MinimalShell* minimal_shell_;
+ static wm::MinimalShell* minimal_shell_;
#endif
#if defined(TOOLKIT_VIEWS)
static views::ViewsDelegate* views_delegate_;
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index 1d87a95..49aca4c 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -31,7 +31,7 @@
#if defined(OS_CHROMEOS)
#include "chromeos/dbus/dbus_thread_manager.h"
#include "ui/aura/test/test_screen.h"
-#include "ui/shell/minimal_shell.h"
+#include "ui/wm/test/minimal_shell.h"
#endif
#if defined(OS_WIN)
@@ -292,7 +292,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
} // namespace
#if defined(OS_CHROMEOS)
-shell::MinimalShell* Shell::minimal_shell_ = NULL;
+wm::MinimalShell* Shell::minimal_shell_ = NULL;
#endif
views::ViewsDelegate* Shell::views_delegate_ = NULL;
@@ -306,7 +306,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 shell::MinimalShell(default_window_size);
+ minimal_shell_ = new wm::MinimalShell(default_window_size);
#else
gfx::Screen::SetScreenInstance(
gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
diff --git a/ui/shell/README.chromium b/ui/shell/README.chromium
deleted file mode 100644
index 9678777..0000000
--- a/ui/shell/README.chromium
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains a minimal shell implementation built using Aura and
-Views.
diff --git a/ui/views/DEPS b/ui/views/DEPS
index d1f1418..7619dc0 100644
--- a/ui/views/DEPS
+++ b/ui/views/DEPS
@@ -15,6 +15,6 @@ include_rules = [
specific_include_rules = {
"examples_browser_main_parts\.cc": [
- "+ui/shell"
+ "+ui/wm/test"
],
}
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 1443159..709e35f 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc
@@ -29,7 +29,7 @@
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/window.h"
-#include "ui/shell/minimal_shell.h"
+#include "ui/wm/test/minimal_shell.h"
#endif
namespace views {
@@ -50,7 +50,7 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
gfx::Screen::SetScreenInstance(
gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
// Set up basic pieces of views::corewm.
- minimal_shell_.reset(new shell::MinimalShell(gfx::Size(800, 600)));
+ minimal_shell_.reset(new wm::MinimalShell(gfx::Size(800, 600)));
// Ensure the X window gets mapped.
minimal_shell_->root_window()->host()->Show();
// Ensure Aura knows where to open new windows.
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.h b/ui/views/examples/content_client/examples_browser_main_parts.h
index f272ff8..f348999 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.h
+++ b/ui/views/examples/content_client/examples_browser_main_parts.h
@@ -14,7 +14,7 @@ class ShellBrowserContext;
struct MainFunctionParams;
}
-namespace shell {
+namespace wm {
class MinimalShell;
}
@@ -45,7 +45,7 @@ class ExamplesBrowserMainParts : public content::BrowserMainParts {
#if defined(OS_CHROMEOS)
// Enable a minimal set of views::corewm to be initialized.
- scoped_ptr<shell::MinimalShell> minimal_shell_;
+ scoped_ptr<wm::MinimalShell> minimal_shell_;
#endif
DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 41f80d6..80e50c3 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -1050,10 +1050,10 @@
'../../third_party/icu/icu.gyp:icuuc',
'../events/events.gyp:events',
'../gfx/gfx.gyp:gfx',
- '../shell/shell.gyp:shell',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../ui.gyp:ui_test_pak',
+ '../wm/wm.gyp:wm_test_support',
'views',
'views_examples_with_content_lib',
'views_test_support'
diff --git a/ui/wm/README.chromium b/ui/wm/README.chromium
new file mode 100644
index 0000000..e45b858
--- /dev/null
+++ b/ui/wm/README.chromium
@@ -0,0 +1,8 @@
+Window Management functionality for apps built on Aura.
+
+public/
+ Implementation-agnostic APIs.
+core/
+ Implementations of public/
+test/
+ Test implementations of public/, and a minimal WM for use in testing.
diff --git a/ui/shell/DEPS b/ui/wm/test/DEPS
index 78adcc9..78adcc9 100644
--- a/ui/shell/DEPS
+++ b/ui/wm/test/DEPS
diff --git a/ui/shell/minimal_shell.cc b/ui/wm/test/minimal_shell.cc
index ca79e8a..d2c289e 100644
--- a/ui/shell/minimal_shell.cc
+++ b/ui/wm/test/minimal_shell.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/shell/minimal_shell.h"
+#include "ui/wm/test/minimal_shell.h"
#include "ui/aura/client/default_activation_client.h"
#include "ui/aura/client/default_capture_client.h"
@@ -12,7 +12,7 @@
#include "ui/views/corewm/compound_event_filter.h"
#include "ui/views/corewm/input_method_event_filter.h"
-namespace shell {
+namespace wm {
MinimalShell::MinimalShell(const gfx::Size& default_window_size) {
aura::Env::CreateInstance();
@@ -53,4 +53,4 @@ aura::Window* MinimalShell::GetDefaultParent(
return root_window_->window();
}
-} // namespace shell
+} // namespace wm
diff --git a/ui/shell/minimal_shell.h b/ui/wm/test/minimal_shell.h
index 22c160b..71cfb8b 100644
--- a/ui/shell/minimal_shell.h
+++ b/ui/wm/test/minimal_shell.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_SHELL_MINIMAL_SHELL_H_
-#define UI_SHELL_MINIMAL_SHELL_H_
+#ifndef UI_WM_TEST_MINIMAL_SHELL_H_
+#define UI_WM_TEST_MINIMAL_SHELL_H_
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
@@ -31,7 +31,7 @@ class InputMethodEventFilter;
} // corewm
} // views
-namespace shell {
+namespace wm {
// Creates a minimal environment for running the shell. We can't pull in all of
// ash here, but we can create attach several of the same things we'd find in
@@ -62,6 +62,6 @@ class MinimalShell : public aura::client::WindowTreeClient {
DISALLOW_COPY_AND_ASSIGN(MinimalShell);
};
-} // namespace shell
+} // namespace wm
-#endif // UI_SHELL_MINIMAL_SHELL_H_
+#endif // UI_WM_TEST_MINIMAL_SHELL_H_
diff --git a/ui/shell/shell.gyp b/ui/wm/wm.gyp
index 71ce1022..38158b0 100644
--- a/ui/shell/shell.gyp
+++ b/ui/wm/wm.gyp
@@ -8,7 +8,7 @@
},
'targets': [
{
- 'target_name': 'shell',
+ 'target_name': 'wm_test_support',
'type': 'static_library',
'dependencies': [
'../../skia/skia.gyp:skia',
@@ -16,8 +16,8 @@
'../views/views.gyp:views',
],
'sources': [
- 'minimal_shell.cc',
- 'minimal_shell.h',
+ 'test/minimal_shell.cc',
+ 'test/minimal_shell.h',
],
},
],
generated by cgit v1.1 at 2025-03-09 17:13:43 +0000