Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

Unified Diff: ash/system/user/

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL:
Patch Set: Created 4 years, 6 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
Index: ash/system/user/
diff --git a/ash/system/user/ b/ash/system/user/
index bb727dc81d96c46be87b6774c1a05548e01e08c5..0cff5edd7916131974604215747f020c58eb1eda 100644
--- a/ash/system/user/
+++ b/ash/system/user/
@@ -7,7 +7,6 @@
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/user/tray_user_separator.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/system/tray/system_tray.h"
@@ -75,11 +74,6 @@ void TrayUserTest::SetUp() {
void TrayUserTest::InitializeParameters(int users_logged_in,
bool multiprofile) {
- // Show the shelf.
- Shelf* shelf = Shelf::ForPrimaryDisplay();
- shelf->shelf_layout_manager()->LayoutShelf();
- shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
// Set our default assumptions. Note that it is sufficient to set these
// after everything was created.

Powered by Google App Engine
This is Rietveld 408576698