summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 20:15:19 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 20:15:19 +0000
commit42aa1fa0adf702861284679eba4ed236187a4272 (patch)
treec279f4e63184c78444fa77162ecaab1c2ab09d6e /ui/aura_shell
parenta495859987b081c6cec74102e5b194d48e124d2e (diff)
downloadchromium_src-42aa1fa0adf702861284679eba4ed236187a4272.zip
chromium_src-42aa1fa0adf702861284679eba4ed236187a4272.tar.gz
chromium_src-42aa1fa0adf702861284679eba4ed236187a4272.tar.bz2
Get more of RenderWidgetHostViewAura running.
This displays content now (software-only) on Windows, and supports Mouse Events. keyboard events are not yet working. http://crbug.com/99757 TEST=none Review URL: http://codereview.chromium.org/8234026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
-rw-r--r--ui/aura_shell/shell.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
index cc815c1..afcd051 100644
--- a/ui/aura_shell/shell.cc
+++ b/ui/aura_shell/shell.cc
@@ -246,6 +246,7 @@ void Shell::AddChildToDefaultParent(aura::Window* window) {
aura::Window* parent = NULL;
switch (window->type()) {
case aura::kWindowType_Toplevel:
+ case aura::kWindowType_Control:
parent = GetContainer(internal::kShellWindowId_DefaultContainer);
break;
case aura::kWindowType_Menu: