chromeos: Convert system tray session length limit to mojo

chrome/browser/ui/ash/session_controller_client.cc

Index: chrome/browser/ui/ash/session_controller_client.cc
diff --git a/chrome/browser/ui/ash/session_controller_client.cc b/chrome/browser/ui/ash/session_controller_client.cc
index 6d3f0ac59948df265688eaffc95f34b0adffcb7e..1869802b475326a06bcde9f0ed8b46465f24b065 100644
--- a/chrome/browser/ui/ash/session_controller_client.cc
+++ b/chrome/browser/ui/ash/session_controller_client.cc
@@ -13,6 +13,7 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
@@ -46,6 +47,12 @@ using user_manager::UserList;
 
 namespace {
 
+// The minimum session length limit that can be set.
+const int kSessionLengthLimitMinMs = 30 * 1000;  // 30 seconds.
+
+// The maximum session length limit that can be set.
+const int kSessionLengthLimitMaxMs = 24 * 60 * 60 * 1000;  // 24 hours.
+
 SessionControllerClient* g_instance = nullptr;
 
 // Returns the session id of a given user or 0 if user has no session.
@@ -132,6 +139,17 @@ SessionControllerClient::SessionControllerClient()
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
 
+  local_state_registrar_.reset(new PrefChangeRegistrar);

[msw, 2017/06/06 19:01:05]

nit: MakeUnique

[James Cook, 2017/06/07 00:48:14]

Done.

+  local_state_registrar_->Init(g_browser_process->local_state());
+  local_state_registrar_->Add(
+      prefs::kSessionStartTime,
+      base::Bind(&SessionControllerClient::SendSessionLengthLimit,
+                 base::Unretained(this)));
+  local_state_registrar_->Add(
+      prefs::kSessionLengthLimit,
+      base::Bind(&SessionControllerClient::SendSessionLengthLimit,
+                 base::Unretained(this)));
+
   DCHECK(!g_instance);
   g_instance = this;
 }
@@ -156,6 +174,7 @@ void SessionControllerClient::Init() {
   SendSessionInfoIfChanged();
   // User sessions and their order will be sent via UserSessionStateObserver
   // even for crash-n-restart.
+  SendSessionLengthLimit();

[msw, 2017/06/06 19:01:04]

nit: put above comment, so this seems less associated with the comment.

[James Cook, 2017/06/07 00:48:14]

Done.

 }
 
 // static
@@ -460,3 +479,24 @@ void SessionControllerClient::SendUserSessionOrder() {
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }
+
+void SessionControllerClient::SendSessionLengthLimit() {
+  const PrefService* local_state = local_state_registrar_->prefs();
+  base::TimeDelta session_length_limit;
+  if (local_state->HasPrefPath(prefs::kSessionLengthLimit)) {
+    session_length_limit = base::TimeDelta::FromMilliseconds(
+        std::min(std::max(local_state->GetInteger(prefs::kSessionLengthLimit),
+                          kSessionLengthLimitMinMs),
+                 kSessionLengthLimitMaxMs));
+  }
+  base::TimeTicks session_start_time;
+  if (local_state->HasPrefPath(prefs::kSessionStartTime)) {
+    session_start_time = base::TimeTicks::FromInternalValue(
+        local_state->GetInt64(prefs::kSessionStartTime));
+  }
+
+  // Send even if both values are zero because enterprise policy could turn
+  // the feature off in the middle of the session.
+  session_controller_->SetSessionLengthLimit(session_length_limit,
+                                             session_start_time);
+}