Rip Out the Sidebar API

chrome/common/extensions/extension.cc

 // Copyright (c) 2011 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/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 #include "crypto/sha2.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/csp_validator.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "chrome/common/extensions/extension_sidebar_defaults.h"
-#include "chrome/common/extensions/extension_sidebar_utils.h"
 #include "chrome/common/extensions/file_browser_handler.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/registry_controlled_domain.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 148 matching lines @@
 const int Extension::kIconSizes[] = {
   EXTENSION_ICON_LARGE,
   EXTENSION_ICON_MEDIUM,
   EXTENSION_ICON_SMALL,
   EXTENSION_ICON_SMALLISH,
   EXTENSION_ICON_BITTY
 };
 
 const int Extension::kPageActionIconMaxSize = 19;
 const int Extension::kBrowserActionIconMaxSize = 19;
-const int Extension::kSidebarIconMaxSize = 16;
 
 const int Extension::kValidWebExtentSchemes =
     URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS;
 
 const int Extension::kValidHostPermissionSchemes =
     UserScript::kValidUserScriptSchemes | URLPattern::SCHEME_CHROMEUI;
 
 Extension::InputComponentInfo::InputComponentInfo()
     : type(INPUT_COMPONENT_TYPE_NONE),
       shortcut_alt(false),
@@ skipping 620 matching lines @@
         default_icon.empty()) {
       *error = ASCIIToUTF16(errors::kInvalidPageActionIconPath);
       return NULL;
     }
     result->set_icon_path(default_icon);
   }
 
   return result.release();
 }
 
-ExtensionSidebarDefaults* Extension::LoadExtensionSidebarDefaults(
-    const DictionaryValue* extension_sidebar, string16* error) {
-  scoped_ptr<ExtensionSidebarDefaults> result(new ExtensionSidebarDefaults());
-
-  std::string default_icon;
-  // Read sidebar's |default_icon| (optional).
-  if (extension_sidebar->HasKey(keys::kSidebarDefaultIcon)) {
-    if (!extension_sidebar->GetString(keys::kSidebarDefaultIcon,
-                                      &default_icon) ||
-        default_icon.empty()) {
-      *error = ASCIIToUTF16(errors::kInvalidSidebarDefaultIconPath);
-      return NULL;
-    }
-    result->set_default_icon_path(default_icon);
-  }
-
-  // Read sidebar's |default_title| (optional).
-  string16 default_title;
-  if (extension_sidebar->HasKey(keys::kSidebarDefaultTitle)) {
-    if (!extension_sidebar->GetString(keys::kSidebarDefaultTitle,
-                                      &default_title)) {
-      *error = ASCIIToUTF16(errors::kInvalidSidebarDefaultTitle);
-      return NULL;
-    }
-  }
-  result->set_default_title(default_title);
-
-  // Read sidebar's |default_page| (optional).
-  // TODO(rdevlin.cronin): Continue removing std::string errors and replace
-  //  with string16
-  std::string default_page;
-  std::string utf8_error;
-  if (extension_sidebar->HasKey(keys::kSidebarDefaultPage)) {
-    if (!extension_sidebar->GetString(keys::kSidebarDefaultPage,
-                                      &default_page) ||
-        default_page.empty()) {
-      *error = ASCIIToUTF16(errors::kInvalidSidebarDefaultPage);
-      return NULL;
-    }
-    GURL url = extension_sidebar_utils::ResolveRelativePath(
-        default_page, this, &utf8_error);
-    *error = UTF8ToUTF16(utf8_error);
-    if (!url.is_valid())
-      return NULL;
-    result->set_default_page(url);
-  }
-
-  return result.release();
-}
-
 bool Extension::LoadExtent(const extensions::Manifest* manifest,
                            const char* key,
                            URLPatternSet* extent,
                            const char* list_error,
                            const char* value_error,
                            string16* error) {
   Value* temp = NULL;
   if (!manifest->Get(key, &temp))
     return true;
 
@@ skipping 1286 matching lines @@
   // Initialize devtools page url (optional).
   if (manifest->HasKey(keys::kDevToolsPage)) {
     std::string devtools_str;
     if (!manifest->GetString(keys::kDevToolsPage, &devtools_str)) {
       *error = ASCIIToUTF16(errors::kInvalidDevToolsPage);
       return false;
     }
     devtools_url_ = GetResourceURL(devtools_str);
   }
 
-  // Initialize sidebar action (optional).
-  if (manifest->HasKey(keys::kSidebar)) {
-    DictionaryValue* sidebar_value = NULL;
-    if (!manifest->GetDictionary(keys::kSidebar, &sidebar_value)) {
-      *error = ASCIIToUTF16(errors::kInvalidSidebar);
-      return false;
-    }
-    if (!api_permissions.count(ExtensionAPIPermission::kExperimental)) {
-      *error = ASCIIToUTF16(errors::kSidebarExperimental);
-      return false;
-    }
-    sidebar_defaults_.reset(LoadExtensionSidebarDefaults(sidebar_value, error));
-    if (!sidebar_defaults_.get())
-      return false;  // Failed to parse sidebar definition.
-  }
-
   // Initialize text-to-speech voices (optional).
   if (manifest->HasKey(keys::kTtsEngine)) {
     DictionaryValue* tts_dict = NULL;
     if (!manifest->GetDictionary(keys::kTtsEngine, &tts_dict)) {
       *error = ASCIIToUTF16(errors::kInvalidTts);
       return false;
     }
 
     if (tts_dict->HasKey(keys::kTtsVoices)) {
       ListValue* tts_voices = NULL;
@@ skipping 747 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}