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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 40053002: Implements the dialog view for logout button tray in public sessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 11 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 | « chrome/browser/ui/ash/chrome_launcher_prefs.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index f230fc5cbc331b0439ddeb6834a5c987e03e2b2f..6fb9aa19d3c691d05e4045c2cff368f4261d69f3 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -909,6 +909,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray,
base::Unretained(this)));
user_pref_registrar_->Add(
+ prefs::kLogoutDialogDurationMs,
+ base::Bind(&SystemTrayDelegate::UpdateLogoutDialogDuration,
+ base::Unretained(this)));
+ user_pref_registrar_->Add(
prefs::kLargeCursorEnabled,
base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged,
base::Unretained(this),
@@ -930,6 +934,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
UpdateClockType();
UpdateShowLogoutButtonInTray();
+ UpdateLogoutDialogDuration();
UpdatePerformanceTracing();
search_key_mapped_to_ =
profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo);
@@ -1001,6 +1006,13 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
prefs::kShowLogoutButtonInTray));
}
+ void UpdateLogoutDialogDuration() {
+ const int duration_ms = user_pref_registrar_->prefs()->GetInteger(
+ prefs::kLogoutDialogDurationMs);
+ GetSystemTrayNotifier()->NotifyLogoutDialogDurationChanged(
+ base::TimeDelta::FromMilliseconds(duration_ms));
+ }
+
void UpdateSessionStartTime() {
const PrefService* local_state = local_state_registrar_->prefs();
if (local_state->HasPrefPath(prefs::kSessionStartTime)) {
« no previous file with comments | « chrome/browser/ui/ash/chrome_launcher_prefs.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698