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

Unified Diff: ash/system/tiles/tray_tiles.cc

Issue 2821363002: cros: Disable system tray help/lock buttons during supervised user creation (Closed)
Patch Set: fix browser test Created 3 years, 8 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/system/tiles/tray_tiles.h ('k') | ash/system/tiles/tray_tiles_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tiles/tray_tiles.cc
diff --git a/ash/system/tiles/tray_tiles.cc b/ash/system/tiles/tray_tiles.cc
index 360c8528928451f1fb910eb18e0538a0fadd2775..60e9024f7c43241b07182c8caaccc27c6e2748f0 100644
--- a/ash/system/tiles/tray_tiles.cc
+++ b/ash/system/tiles/tray_tiles.cc
@@ -5,7 +5,6 @@
#include "ash/system/tiles/tray_tiles.h"
#include "ash/metrics/user_metrics_action.h"
-#include "ash/session/session_state_delegate.h"
#include "ash/system/tiles/tiles_default_view.h"
namespace ash {
@@ -25,13 +24,14 @@ TilesDefaultView* TrayTiles::GetDefaultViewForTesting() const {
return default_view_;
}
-views::View* TrayTiles::CreateDefaultViewForTesting(LoginStatus status) {
- return CreateDefaultView(status);
+views::View* TrayTiles::CreateDefaultViewForTesting() {
+ // Login status is unused.
+ return CreateDefaultView(LoginStatus::USER);
}
views::View* TrayTiles::CreateDefaultView(LoginStatus status) {
CHECK(default_view_ == nullptr);
- default_view_ = new TilesDefaultView(this, status);
+ default_view_ = new TilesDefaultView(this);
default_view_->Init();
return default_view_;
}
« no previous file with comments | « ash/system/tiles/tray_tiles.h ('k') | ash/system/tiles/tray_tiles_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698