| Index: ash/focus_cycler_unittest.cc
|
| diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
|
| index 5b25d966b3c654e5b98679899092bd0b5bb413b3..33c89c2c7f22c120ab3338138140cf3c995642d4 100644
|
| --- a/ash/focus_cycler_unittest.cc
|
| +++ b/ash/focus_cycler_unittest.cc
|
| @@ -27,14 +27,11 @@ namespace ash {
|
| namespace test {
|
|
|
| using aura::Window;
|
| -using internal::FocusCycler;
|
|
|
| namespace {
|
|
|
| -internal::StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate(
|
| - views::Widget* widget) {
|
| - return static_cast<internal::StatusAreaWidgetDelegate*>(
|
| - widget->GetContentsView());
|
| +StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate(views::Widget* widget) {
|
| + return static_cast<StatusAreaWidgetDelegate*>(widget->GetContentsView());
|
| }
|
|
|
| class PanedWidgetDelegate : public views::WidgetDelegate {
|
| @@ -96,10 +93,11 @@ class FocusCyclerTest : public AshTestBase {
|
| bool CreateTray() {
|
| if (tray_)
|
| return false;
|
| - aura::Window* parent = Shell::GetPrimaryRootWindowController()->
|
| - GetContainer(ash::internal::kShellWindowId_StatusContainer);
|
| + aura::Window* parent =
|
| + Shell::GetPrimaryRootWindowController()->GetContainer(
|
| + ash::kShellWindowId_StatusContainer);
|
|
|
| - internal::StatusAreaWidget* widget = new internal::StatusAreaWidget(parent);
|
| + StatusAreaWidget* widget = new StatusAreaWidget(parent);
|
| widget->CreateTrayViews();
|
| widget->Show();
|
| tray_.reset(widget->system_tray());
|
|
|