Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1477)

Unified Diff: ash/focus_cycler_unittest.cc

Issue 2745723002: chromeos: Fix shutdown crash in status area teardown on stylus devices (Closed)
Patch Set: remove unnecessary include Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/status_area_widget.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/focus_cycler_unittest.cc
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 078093967c7794fd272425007cd8f08567fb91b9..1c42b81e39e4ffed78138e69d1c2e0db99c65468 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -13,7 +13,6 @@
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/wm_shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/status_area_widget_test_helper.h"
#include "ash/wm/window_util.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
@@ -79,12 +78,8 @@ class FocusCyclerTest : public AshTestBase {
}
protected:
- // Setup the system tray using StatusAreaWidgetTestHelper and focus_cycler.
+ // Setup the system tray focus cycler.
void SetUpTrayFocusCycle() {
- StatusAreaWidget* widget =
- StatusAreaWidgetTestHelper::GetStatusAreaWidget();
- widget->CreateTrayViews();
- widget->Show();
views::Widget* system_tray_widget = GetPrimarySystemTray()->GetWidget();
ASSERT_TRUE(system_tray_widget);
focus_cycler_->AddWidget(system_tray_widget);
« no previous file with comments | « ash/common/system/status_area_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698