Pass user session type to extension feature checks

extensions/common/extension_api.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 "extensions/common/extension_api.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 247 matching lines @@
 void ExtensionAPI::RegisterSchemaResource(const std::string& name,
                                           int resource_id) {
   unloaded_schemas_[name] = resource_id;
 }
 
 void ExtensionAPI::RegisterDependencyProvider(const std::string& name,
                                               const FeatureProvider* provider) {
   dependency_providers_[name] = provider;
 }
 
-bool ExtensionAPI::IsAnyFeatureAvailableToContext(const Feature& api,
-                                                  const Extension* extension,
-                                                  Feature::Context context,
-                                                  const GURL& url) {
+bool ExtensionAPI::IsAnyFeatureAvailableToContext(
+    const Feature& api,
+    const Extension* extension,
+    Feature::Context context,
+    Feature::SessionType session_type,
+    const GURL& url) {
   FeatureProviderMap::iterator provider = dependency_providers_.find("api");
   CHECK(provider != dependency_providers_.end());
 
-  if (api.IsAvailableToContext(extension, context, url).is_available())
+  if (api.IsAvailableToContext(extension, context, session_type, url)
+          .is_available())
     return true;
 
   // Check to see if there are any parts of this API that are allowed in this
   // context.
   const std::vector<Feature*> features = provider->second->GetChildren(api);
   for (std::vector<Feature*>::const_iterator it = features.begin();
        it != features.end();
        ++it) {
-    if ((*it)->IsAvailableToContext(extension, context, url).is_available())
+    if ((*it)
+            ->IsAvailableToContext(extension, context, session_type, url)
+            .is_available())
       return true;
   }
   return false;
 }
 
-Feature::Availability ExtensionAPI::IsAvailable(const std::string& full_name,
-                                                const Extension* extension,
-                                                Feature::Context context,
-                                                const GURL& url) {
+Feature::Availability ExtensionAPI::IsAvailable(
+    const std::string& full_name,
+    const Extension* extension,
+    Feature::Context context,
+    Feature::SessionType session_type,
+    const GURL& url) {
   Feature* feature = GetFeatureDependency(full_name);
   if (!feature) {
     return Feature::Availability(Feature::NOT_PRESENT,
                                  std::string("Unknown feature: ") + full_name);
   }
-  return feature->IsAvailableToContext(extension, context, url);
+  return feature->IsAvailableToContext(extension, context, session_type, url);
 }
 
 bool ExtensionAPI::IsAvailableToWebUI(const std::string& name,
+                                      Feature::SessionType session_type,
                                       const GURL& url) {
-  return IsAvailable(name, NULL, Feature::WEBUI_CONTEXT, url).is_available();
+  return IsAvailable(name, NULL, Feature::WEBUI_CONTEXT, session_type, url)
+      .is_available();
 }
 
 const base::DictionaryValue* ExtensionAPI::GetSchema(
     const std::string& full_name) {
   std::string child_name;
   std::string api_name = GetAPINameFromFullName(full_name, &child_name);
 
   const base::DictionaryValue* result = NULL;
   SchemaMap::iterator maybe_schema = schemas_.find(api_name);
   if (maybe_schema != schemas_.end()) {
@@ skipping 73 matching lines @@
       break;
 
     api_name_candidate = api_name_candidate.substr(0, last_dot_index);
   }
 
   *child_name = "";
   return std::string();
 }
 
 }  // namespace extensions