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

chrome/browser/extensions/extension_sidebar_api.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/browser/extensions/extension_sidebar_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/string16.h"
@@ skipping 19 matching lines @@
 const char kNoSidebarError[] =
     "This extension has no sidebar specified.";
 const char kNoTabError[] = "No tab with id: *.";
 const char kNoCurrentWindowError[] = "No current browser window was found";
 const char kNoDefaultTabError[] = "No default tab was found";
 const char kInvalidExpandContextError[] =
     "Sidebar can be expanded only in response to an explicit user gesture";
 // Keys.
 const char kBadgeTextKey[] = "text";
 const char kImageDataKey[] = "imageData";
+const char kPathKey[] = "path";
 const char kStateKey[] = "state";
 const char kTabIdKey[] = "tabId";
 const char kTitleKey[] = "title";
-const char kUrlKey[] = "url";
 // Events.
 const char kOnStateChanged[] = "experimental.sidebar.onStateChanged";
 }  // namespace
 
 namespace extension_sidebar_constants {
 // Sidebar states.
 const char kActiveState[] = "active";
 const char kHiddenState[] = "hidden";
 const char kShownState[] = "shown";
 }  // namespace extension_sidebar_constants
@@ skipping 143 matching lines @@
 bool HideSidebarFunction::RunImpl(TabContents* tab,
                                   const std::string& content_id,
                                   const DictionaryValue& details) {
   SidebarManager::GetInstance()->HideSidebar(tab, content_id);
   return true;
 }
 
 bool NavigateSidebarFunction::RunImpl(TabContents* tab,
                                       const std::string& content_id,
                                       const DictionaryValue& details) {
-  std::string url_string;
-  EXTENSION_FUNCTION_VALIDATE(details.GetString(kUrlKey, &url_string));
+  std::string path_string;
+  EXTENSION_FUNCTION_VALIDATE(details.GetString(kPathKey, &path_string));
 
-  GURL url = extension_sidebar_utils::ResolveAndVerifyUrl(
-      url_string, GetExtension(), &error_);
+  GURL url = extension_sidebar_utils::ResolveRelativePath(
+      path_string, GetExtension(), &error_);
   if (!url.is_valid())
     return false;
 
   SidebarManager::GetInstance()->NavigateSidebar(tab, content_id, url);
   return true;
 }
 
 bool SetBadgeTextSidebarFunction::RunImpl(TabContents* tab,
                                           const std::string& content_id,
                                           const DictionaryValue& details) {
@@ skipping 26 matching lines @@
   SidebarManager::GetInstance()->SetSidebarTitle(tab, content_id, title);
   return true;
 }
 
 bool ShowSidebarFunction::RunImpl(TabContents* tab,
                                   const std::string& content_id,
                                   const DictionaryValue& details) {
   SidebarManager::GetInstance()->ShowSidebar(tab, content_id);
   return true;
 }