Pass user session type to extension feature checks

chrome/browser/extensions/chrome_extensions_browser_client.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 32 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/update_client/update_client.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/browser/api/generated_api_registration.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_util.h"
 #include "extensions/browser/mojo/service_registration.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/browser/url_request_util.h"
 #include "extensions/common/features/feature_channel.h"
+#include "extensions/common/features/feature_session_type.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h"
 #include "chrome/browser/extensions/updater/extension_cache_impl.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user_manager.h"
 #else
 #include "extensions/browser/updater/null_extension_cache.h"
 #endif
 
 namespace extensions {
 
+namespace {
+
+FeatureSessionType GetCurrentSessionType() {
+#if defined(OS_CHROMEOS)
+  if (!user_manager::UserManager::IsInitialized())
+    return FEATURE_SESSION_TYPE_UNKNOWN;
+  if (user_manager::UserManager::Get()->IsLoggedInAsUserWithGaiaAccount())
+    return FEATURE_SESSION_TYPE_REGULAR;
+  if (user_manager::UserManager::Get()->IsLoggedInAsKioskApp())
+    return FEATURE_SESSION_TYPE_KIOSK;
+  return FEATURE_SESSION_TYPE_UNKNOWN;
+#else
+    return FEATURE_SESSION_TYPE_REGULAR;

[Devlin, 2016/08/18 17:19:15]

indentation

[tbarzic, 2016/08/18 18:58:10]

Done, but I realized I have to move this a bit later - it has to be set when a
user logs in rather than when browser process starts up.

+#endif
+}
+
+}  // namespace
+
 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
   process_manager_delegate_.reset(new ChromeProcessManagerDelegate);
   api_client_.reset(new ChromeExtensionsAPIClient);
   // Only set if it hasn't already been set (e.g. by a test).
   if (GetCurrentChannel() == GetDefaultChannel())
     SetCurrentChannel(chrome::GetChannel());
+  SetCurrentFeatureSessionType(GetCurrentSessionType());
   resource_manager_.reset(new ChromeComponentExtensionResourceManager());
 }
 
 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
 
 bool ChromeExtensionsBrowserClient::IsShuttingDown() {
   return g_browser_process->IsShuttingDown();
 }
 
 bool ChromeExtensionsBrowserClient::AreExtensionsDisabled(
@@ skipping 325 matching lines @@
       new ChromeExtensionBluetoothChooser(frame, event_handler));
 }
 
 bool ChromeExtensionsBrowserClient::IsActivityLoggingEnabled(
     content::BrowserContext* context) {
   ActivityLog* activity_log = ActivityLog::GetInstance(context);
   return activity_log && activity_log->is_active();
 }
 
 }  // namespace extensions