[Extension Toolbar] Don't synthesize actions for policy extensions

chrome/common/extensions/manifest_handlers/extension_action_handler.cc

 // Copyright 2014 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/common/extensions/manifest_handlers/extension_action_handler.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
@@ skipping 43 matching lines @@
     if (!action_info)
       return false;  // Failed to parse extension action definition.
 
     if (key == manifest_keys::kPageAction)
       ActionInfo::SetPageActionInfo(extension, action_info.release());
     else
       ActionInfo::SetBrowserActionInfo(extension, action_info.release());
   } else {  // No key, used for synthesizing an action for extensions with none.
     if (!FeatureSwitch::extension_action_redesign()->IsEnabled())
       return true;  // Do nothing if the switch is off.
-    if (Manifest::IsComponentLocation(extension->location()))
-      return true;  // Don't synthesize actions for component extensions.
+    if (Manifest::IsComponentLocation(extension->location()) ||
+        Manifest::IsPolicyLocation(extension->location()))
+      return true;  // Don't synthesize actions for component/policy extensions.
     if (extension->manifest()->HasKey(
             manifest_keys::kSynthesizeExtensionAction)) {
       *error = base::ASCIIToUTF16(base::StringPrintf(
           "Key %s is reserved.", manifest_keys::kSynthesizeExtensionAction));
       return false;  // No one should use this key.
     }
 
     // Set an empty page action. We use a page action (instead of a browser
     // action) because the action should not be seen as enabled on every page.
     ActionInfo::SetPageActionInfo(extension, new ActionInfo());
@@ skipping 29 matching lines @@
 
 const std::vector<std::string> ExtensionActionHandler::Keys() const {
   std::vector<std::string> keys;
   keys.push_back(manifest_keys::kPageAction);
   keys.push_back(manifest_keys::kBrowserAction);
   keys.push_back(manifest_keys::kSynthesizeExtensionAction);
   return keys;
 }
 
 }  // namespace extensions