windows.create({url:}) now supports relative paths. tabs.update()/tabs.move() now return Tab.

chrome/browser/extensions/extension_tabs_module.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_tabs_module.h"
 
 #include "base/gfx/jpeg_codec.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 242 matching lines @@
   // Look for optional url.
   if (!args_->IsType(Value::TYPE_NULL)) {
     EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
     const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
     std::string url_input;
     if (args->HasKey(keys::kUrlKey)) {
       EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kUrlKey,
                                                   &url_input));
       url.reset(new GURL(url_input));
       if (!url->is_valid()) {
-        error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kInvalidUrlError,
-            url_input);
-        return false;
+        // The path as passed in is not valid. Try converting to absolute path.
+        *url = GetExtension()->GetResourceURL(url_input);
+        if (!url->is_valid()) {
+          error_ = ExtensionErrorUtils::FormatErrorMessage(
+              keys::kInvalidUrlError,
+              url_input);
+          return false;
+        }
       }
     }
   }
 
   // Try to position the new browser relative its originating browser window.
   gfx::Rect empty_bounds;
   gfx::Rect bounds;
   bool maximized;
   // The call offsets the bounds by kWindowTilePixels (defined in WindowSizer to
   // be 10)
@@ skipping 315 matching lines @@
   if (update_props->HasKey(keys::kSelectedKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(
         keys::kSelectedKey,
         &selected));
     if (selected && tab_strip->selected_index() != tab_index) {
       tab_strip->SelectTabContentsAt(tab_index, false);
       DCHECK_EQ(contents, tab_strip->GetSelectedTabContents());
     }
   }
 
+  if (has_callback())
+    result_.reset(ExtensionTabUtil::CreateTabValue(contents, tab_strip,
+        tab_index));
+
   return true;
 }
 
 bool MoveTabFunction::RunImpl() {
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
   const ListValue* args = static_cast<const ListValue*>(args_);
   EXTENSION_FUNCTION_VALIDATE(args->GetInteger(0, &tab_id));
   DictionaryValue* update_props;
   EXTENSION_FUNCTION_VALIDATE(args->GetDictionary(1, &update_props));
 
   int new_index;
   EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
       keys::kIndexKey, &new_index));
   EXTENSION_FUNCTION_VALIDATE(new_index >= 0);
 
   Browser* source_browser = NULL;
   TabStripModel* source_tab_strip = NULL;
+  TabContents* contents = NULL;
   int tab_index = -1;
-  if (!GetTabById(tab_id, profile(), &source_browser, &source_tab_strip, NULL,
-      &tab_index, &error_))
+  if (!GetTabById(tab_id, profile(), &source_browser, &source_tab_strip,
+      &contents, &tab_index, &error_))
     return false;
 
   if (update_props->HasKey(keys::kWindowIdKey)) {
     Browser* target_browser;
     int window_id;
     EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
         keys::kWindowIdKey, &window_id));
     target_browser = GetBrowserInProfileWithId(profile(), window_id,
         &error_);
     if (!target_browser)
       return false;
 
     // If windowId is different from the current window, move between windows.
     if (ExtensionTabUtil::GetWindowId(target_browser) !=
         ExtensionTabUtil::GetWindowId(source_browser)) {
       TabStripModel* target_tab_strip = target_browser->tabstrip_model();
-      TabContents *contents = source_tab_strip->DetachTabContentsAt(tab_index);
+      contents = source_tab_strip->DetachTabContentsAt(tab_index);
       if (!contents) {
         error_ = ExtensionErrorUtils::FormatErrorMessage(
             keys::kTabNotFoundError, IntToString(tab_id));
         return false;
       }
 
       // Clamp move location to the last position.
       // This is ">" because it can append to a new index position.
       if (new_index > target_tab_strip->count())
         new_index = target_tab_strip->count();
 
       target_tab_strip->InsertTabContentsAt(new_index, contents,
           false, true);
 
+      if (has_callback())
+        result_.reset(ExtensionTabUtil::CreateTabValue(contents,
+            target_tab_strip, new_index));
+
       return true;
     }
   }
 
   // Perform a simple within-window move.
   // Clamp move location to the last position.
   // This is ">=" because the move must be to an existing location.
   if (new_index >= source_tab_strip->count())
     new_index = source_tab_strip->count() - 1;
 
   if (new_index != tab_index)
     source_tab_strip->MoveTabContentsAt(tab_index, new_index, false);
-
+  
+  if (has_callback())
+    result_.reset(ExtensionTabUtil::CreateTabValue(contents, source_tab_strip,
+        new_index));
   return true;
 }
 
 
 bool RemoveTabFunction::RunImpl() {
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetAsInteger(&tab_id));
 
   Browser* browser = NULL;
   TabContents* contents = NULL;
@@ skipping 175 matching lines @@
   if (ExtensionTabUtil::GetTabById(tab_id, profile, browser, tab_strip,
                                    contents, tab_index))
     return true;
 
   if (error_message)
     *error_message = ExtensionErrorUtils::FormatErrorMessage(
         keys::kTabNotFoundError, IntToString(tab_id));
 
   return false;
 }