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

Unified Diff: ash/system/network/network_state_list_detailed_view.cc

Issue 2822033002: cros: Use SessionController to enable system tray settings / notifications tray (Closed)
Patch Set: 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
Index: ash/system/network/network_state_list_detailed_view.cc
diff --git a/ash/system/network/network_state_list_detailed_view.cc b/ash/system/network/network_state_list_detailed_view.cc
index 9bb2996a76d0edef330e9745a9714a3be2509109..2fd64f3c1df6368d3cfc99dd329161453d8fd630 100644
--- a/ash/system/network/network_state_list_detailed_view.cc
+++ b/ash/system/network/network_state_list_detailed_view.cc
@@ -11,6 +11,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
+#include "ash/session/session_controller.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
#include "ash/strings/grit/ash_strings.h"
@@ -339,8 +340,8 @@ void NetworkStateListDetailedView::CreateExtraTitleRowButtons() {
// Allow the user to access settings only if user is logged in
// and showing settings is allowed. There are situations (supervised user
// creation flow) when session is started but UI flow continues within
- // login UI, i.e., no browser window is yet avaialable.
- if (!Shell::Get()->system_tray_delegate()->ShouldShowSettings())
+ // login UI, i.e., no browser window is yet available.
+ if (!Shell::Get()->session_controller()->ShouldEnableSettings())
settings_button_->SetEnabled(false);
tri_view()->AddView(TriView::Container::END, settings_button_);

Powered by Google App Engine
This is Rietveld 408576698