handle mole/toolstrip URLs properly

chrome/browser/extensions/extension_toolstrip_api.cc

 // Copyright (c) 2009 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_toolstrip_api.h"
 
 #include "base/json_writer.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ skipping 15 matching lines @@
 // Errors.
 const char kNotAToolstripError[] = "This page is not a toolstrip.";
 const char kAlreadyExpandedError[] = "This toolstrip is already expanded.";
 const char kAlreadyCollapsedError[] = "This toolstrip is already collapsed.";
 const char kInvalidURLError[] = "Invalid URL";
 const char kBadHeightError[] = "Bad height.";
 
 // TODO(erikkay) what are good values here?
 const int kMinHeight = 50;
 const int kMaxHeight = 1000;
+
+// If |url_string| is a valid URL, simply return that, otherwise see if it's
+// a valid extension URL, relative to the |current_url|.
+static GURL ResolveURLForExtension(const std::string& url_string,

[Matt Perry, 2009/09/15 20:31:57]

I think Resolve works on absolute URLs too, so this whole function can be
replaced with current_url.Resolve(url_string).

+                                    const GURL& current_url,
+                                    Extension *extension) {
+  GURL url = GURL(url_string);
+  if (!url.is_valid()) {
+    url = current_url.Resolve(url_string);
+    if (url.is_empty())
+      return url;
+  }
+  return url;
+}
+
 };  // namespace
 
 namespace keys = extension_tabs_module_constants;
 namespace events = extension_toolstrip_api_events;
 
 bool ToolstripFunction::RunImpl() {
   ExtensionHost* host = dispatcher()->GetExtensionHost();
   if (!host) {
     error_ = kNotAToolstripError;
     return false;
@@ skipping 29 matching lines @@
 
   int height;
   EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kHeightKey,
                                                &height));
   EXTENSION_FUNCTION_VALIDATE(height >= 0);
   if (height < kMinHeight || height > kMaxHeight) {
     error_ = kBadHeightError;
     return false;
   }
 
-
   GURL url;
   if (args->HasKey(keys::kUrlKey)) {
     std::string url_string;
     EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kUrlKey,
                                                 &url_string));
-    url = GURL(url_string);
-    if (!url.is_valid() && !url.is_empty()) {
+    url = ResolveURLForExtension(url_string, 
+                                 dispatcher()->url(),
+                                 dispatcher()->GetExtension());
+    if (!url.is_valid()) {
       error_ = kInvalidURLError;
       return false;
     }
   }
 
   model_->ExpandToolstrip(toolstrip_, url, height);
   return true;
 }
 
 bool ToolstripCollapseFunction::RunImpl() {
   if (!ToolstripFunction::RunImpl())
     return false;
 
   if (toolstrip_->height == 0) {
     error_ = kAlreadyCollapsedError;
     return false;
   }
 
   GURL url;
   if (args_->GetType() != Value::TYPE_NULL) {
     EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
     const DictionaryValue* args = static_cast<const DictionaryValue*>(args_);
 
     if (args->HasKey(keys::kUrlKey)) {
       std::string url_string;
       EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kUrlKey,
                                                   &url_string));
-      url = GURL(url_string);
-      if (!url.is_valid() && !url.is_empty()) {
+      url = ResolveURLForExtension(url_string, 
+                                   dispatcher()->url(),
+                                   dispatcher()->GetExtension());
+      if (!url.is_valid()) {
         error_ = kInvalidURLError;
         return false;
       }
     }
   }
 
   model_->CollapseToolstrip(toolstrip_, url);
   return true;
 }
 
@@ skipping 29 matching lines @@
 void ToolstripEventRouter::OnToolstripCollapsed(Profile* profile,
                                                 int routing_id,
                                                 const GURL &url) {
   ListValue args;
   DictionaryValue* obj = new DictionaryValue();
   if (!url.is_empty())
     obj->SetString(keys::kUrlKey, url.spec());
   args.Append(obj);
   DispatchEvent(profile, routing_id, events::kOnToolstripCollapsed, args);
 }