summaryrefslogtreecommitdiffstats
path: root/ash/focus_cycler_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 18:59:50 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 18:59:50 +0000
commit16059276dc0a1c38d0dcaf59378649b816d7a7e0 (patch)
tree61673579c89fa4f761ad4fde947b486bce32c08c /ash/focus_cycler_unittest.cc
parent8b755c497330facddd2926a6d7f7bad7e389f321 (diff)
downloadchromium_src-16059276dc0a1c38d0dcaf59378649b816d7a7e0.zip
chromium_src-16059276dc0a1c38d0dcaf59378649b816d7a7e0.tar.gz
chromium_src-16059276dc0a1c38d0dcaf59378649b816d7a7e0.tar.bz2
Create launcher on secondary displays
Notify all root window controllers when login status has changed. This requires more refactoring to be functional and I'll add test when it starts working. BUG=145978 TEST=none Review URL: https://chromiumcodereview.appspot.com/11198087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler_unittest.cc')
-rw-r--r--ash/focus_cycler_unittest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index a55472b..2ba405a 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -5,6 +5,7 @@
#include "ash/focus_cycler.h"
#include "ash/launcher/launcher.h"
+#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/system/status_area_widget.h"
@@ -66,7 +67,10 @@ class FocusCyclerTest : public AshTestBase {
bool CreateTray() {
if (tray_.get())
return false;
- internal::StatusAreaWidget* widget = new internal::StatusAreaWidget;
+ aura::Window* parent = Shell::GetPrimaryRootWindowController()->
+ GetContainer(ash::internal::kShellWindowId_StatusContainer);
+
+ internal::StatusAreaWidget* widget = new internal::StatusAreaWidget(parent);
widget->CreateTrayViews(NULL);
widget->Show();
tray_.reset(widget->system_tray());