summaryrefslogtreecommitdiffstats
path: root/ash/shell/panel_window.cc
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 05:08:22 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 05:08:22 +0000
commit79a87b7ec1cb84b88b6e034cd7d4acac3b57a1ee (patch)
tree69bb3ad7786a45271527d89176724dca3ff4bbd2 /ash/shell/panel_window.cc
parent19d7d702397f49a55db656267849639296ba5f3d (diff)
downloadchromium_src-79a87b7ec1cb84b88b6e034cd7d4acac3b57a1ee.zip
chromium_src-79a87b7ec1cb84b88b6e034cd7d4acac3b57a1ee.tar.gz
chromium_src-79a87b7ec1cb84b88b6e034cd7d4acac3b57a1ee.tar.bz2
Fix panel related regressions in ash_shell
BUG=172047 Review URL: https://chromiumcodereview.appspot.com/12040081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/panel_window.cc')
-rw-r--r--ash/shell/panel_window.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc
index fb70024..8ab5ae3 100644
--- a/ash/shell/panel_window.cc
+++ b/ash/shell/panel_window.cc
@@ -4,8 +4,10 @@
#include "ash/shell/panel_window.h"
+#include "ash/shell.h"
#include "ash/wm/panel_frame_view.h"
#include "base/utf_string_conversions.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/gfx/canvas.h"
#include "ui/views/widget/widget.h"
@@ -23,6 +25,7 @@ namespace ash {
views::Widget* PanelWindow::CreatePanelWindow(const gfx::Rect& rect) {
PanelWindow* panel_window = new PanelWindow("Example Panel Window");
panel_window->params().bounds = rect;
+ panel_window->params().context = Shell::GetPrimaryRootWindow();
return panel_window->CreateWidget();
}