Only allow extension pages to be displayed in the sidebar to be consistent...

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/base64.h"
@@ skipping 817 matching lines @@
   string16 default_title;
   if (extension_sidebar->HasKey(keys::kSidebarDefaultTitle)) {
     if (!extension_sidebar->GetString(keys::kSidebarDefaultTitle,
                                       &default_title)) {
       *error = errors::kInvalidSidebarDefaultTitle;
       return NULL;
     }
   }
   result->set_default_title(default_title);
 
-  // Read sidebar's |default_url| (optional).
-  std::string default_url;
-  if (extension_sidebar->HasKey(keys::kSidebarDefaultUrl)) {
-    if (!extension_sidebar->GetString(keys::kSidebarDefaultUrl, &default_url) ||
-        default_url.empty()) {
-      *error = errors::kInvalidSidebarDefaultUrl;
+  // Read sidebar's |default_page| (optional).
+  std::string default_page;
+  if (extension_sidebar->HasKey(keys::kSidebarDefaultPage)) {
+    if (!extension_sidebar->GetString(keys::kSidebarDefaultPage,
+                                      &default_page) ||
+        default_page.empty()) {
+      *error = errors::kInvalidSidebarDefaultPage;
       return NULL;
     }
-    GURL resolved_url = extension_sidebar_utils::ResolveAndVerifyUrl(
-        default_url, this, error);
-    if (!resolved_url.is_valid())
+    GURL url = extension_sidebar_utils::ResolveRelativePath(
+        default_page, this, error);
+    if (!url.is_valid())
       return NULL;
-    result->set_default_url(resolved_url);
+    result->set_default_page(url);
   }
 
   return result.release();
 }
 
 bool Extension::ContainsNonThemeKeys(const DictionaryValue& source) const {
   for (DictionaryValue::key_iterator key = source.begin_keys();
        key != source.end_keys(); ++key) {
     if (!IsBaseCrxKey(*key) && *key != keys::kTheme)
       return true;
@@ skipping 1029 matching lines @@
       *error = errors::kInvalidDevToolsPage;
       return false;
     }
     if (!HasApiPermission(Extension::kExperimentalPermission)) {
       *error = errors::kDevToolsExperimental;
       return false;
     }
     devtools_url_ = GetResourceURL(devtools_str);
   }
 
+  // Initialize sidebar action (optional).
+  if (source.HasKey(keys::kSidebar)) {
+    DictionaryValue* sidebar_value;
+    if (!source.GetDictionary(keys::kSidebar, &sidebar_value)) {
+      *error = errors::kInvalidSidebar;
+      return false;
+    }
+    if (!HasApiPermission(Extension::kExperimentalPermission)) {
+      *error = 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 (source.HasKey(keys::kTts)) {
     DictionaryValue* tts_dict;
     if (!source.GetDictionary(keys::kTts, &tts_dict)) {
       *error = errors::kInvalidTts;
       return false;
     }
 
     if (tts_dict->HasKey(keys::kTtsVoices)) {
       ListValue* tts_voices;
@@ skipping 59 matching lines @@
     }
   }
 
   if (HasMultipleUISurfaces()) {
     *error = errors::kOneUISurfaceOnly;
     return false;
   }
 
   InitEffectiveHostPermissions();
 
-  // Initialize sidebar action (optional). It has to be done after host
-  // permissions are initialized to verify default sidebar url.
-  if (source.HasKey(keys::kSidebar)) {
-    DictionaryValue* sidebar_value;
-    if (!source.GetDictionary(keys::kSidebar, &sidebar_value)) {
-      *error = errors::kInvalidSidebar;
-      return false;
-    }
-    if (!HasApiPermission(Extension::kExperimentalPermission)) {
-      *error = errors::kSidebarExperimental;
-      return false;
-    }
-    sidebar_defaults_.reset(LoadExtensionSidebarDefaults(sidebar_value, error));
-    if (!sidebar_defaults_.get())
-      return false;  // Failed to parse sidebar definition.
-  }
-
   // Although |source| is passed in as a const, it's still possible to modify
   // it.  This is dangerous since the utility process re-uses |source| after
   // it calls InitFromValue, passing it up to the browser process which calls
   // InitFromValue again.  As a result, we need to make sure that nobody
   // accidentally modifies it.
   DCHECK(source.Equals(manifest_value_.get()));
 
   return true;
 }
 
@@ skipping 366 matching lines @@
 
 UninstalledExtensionInfo::~UninstalledExtensionInfo() {}
 
 
 UnloadedExtensionInfo::UnloadedExtensionInfo(
     const Extension* extension,
     Reason reason)
   : reason(reason),
     already_disabled(false),
     extension(extension) {}