Always enable enhanced bookmarks external component extensions for incognito mode

chrome/browser/extensions/extension_util.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/extension_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "content/public/browser/site_instance.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
+#include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace extensions {
 namespace util {
 
 namespace {
 // The entry into the ExtensionPrefs for allowing an extension to script on
 // all urls without explicit permission.
 const char kExtensionAllowedOnAllUrlsPrefName[] =
     "extension_can_script_all_urls";
+
+// Returns true if |extension_id| for an external component extension should
+// always be enabled in incognito windows.
+bool IsWhitelistedForIncognito(const std::string& extension_id) {
+  static const char* kExtensionWhitelist[] = {
+    "D5736E4B5CF695CB93A2FB57E4FDC6E5AFAB6FE2", // http://crbug.com/312900
+    "D57DE394F36DC1C3220E7604C575D29C51A6C495", // http://crbug.com/319444

[not at google - send to devlin, 2014/06/19 01:27:34]

nit: 2 spaces before comment

[Mike Wittman, 2014/06/19 16:42:02]

Done.

+    "3F65507A3B39259B38C8173C6FFA3D12DF64CCE9"  // http://crbug.com/371562
+  };
+
+  return extensions::SimpleFeature::IsIdInList(
+      extension_id,
+      std::set<std::string>(
+          kExtensionWhitelist,
+          kExtensionWhitelist + arraysize(kExtensionWhitelist)));
 }
+}  // namespace
 
 bool IsIncognitoEnabled(const std::string& extension_id,
                         content::BrowserContext* context) {
   const Extension* extension = ExtensionRegistry::Get(context)->
       GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
   if (extension) {
     if (!extension->can_be_incognito_enabled())
       return false;
     // If this is an existing component extension we always allow it to
     // work in incognito mode.
     if (extension->location() == Manifest::COMPONENT)
       return true;
+    if (extension->location() == Manifest::EXTERNAL_COMPONENT &&
+        IsWhitelistedForIncognito(extension_id))
+      return true;

[not at google - send to devlin, 2014/06/19 01:27:34]

nit: curlies on body with multi-line condition.

[Mike Wittman, 2014/06/19 16:42:02]

Done.

   }
 
   return ExtensionPrefs::Get(context)->IsIncognitoEnabled(extension_id);
 }
 
 void SetIsIncognitoEnabled(const std::string& extension_id,
                            content::BrowserContext* context,
                            bool enabled) {
   ExtensionService* service =
       ExtensionSystem::Get(context)->extension_service();
@@ skipping 207 matching lines @@
       IDR_APP_DEFAULT_ICON);
 }
 
 const gfx::ImageSkia& GetDefaultExtensionIcon() {
   return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_EXTENSION_DEFAULT_ICON);
 }
 
 }  // namespace util
 }  // namespace extensions