Merging r18584 into chrome/browser/views/tab_contents/tab_contents_view_win.c...

chrome/browser/views/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 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/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
@@ skipping 126 matching lines @@
     }
     file_name = file_name.ReplaceExtension(drop_data.file_extension);
     data->SetFileContents(file_name.value(), drop_data.file_contents);
   }
   if (!drop_data.text_html.empty())
     data->SetHtml(drop_data.text_html, drop_data.html_base_url);
   if (drop_data.url.is_valid()) {
     if (drop_data.url.SchemeIs(chrome::kJavaScriptScheme)) {
       // We don't want to allow javascript URLs to be dragged to the desktop,
       // but we do want to allow them to be added to the bookmarks bar
-      // (bookmarklets).
+      // (bookmarklets). So we create a fake bookmark entry (BookmarkDragData
+      // object) which explorer.exe cannot handle, and write the entry to data.
       BookmarkDragData::Element bm_elt;
       bm_elt.is_url = true;
       bm_elt.url = drop_data.url;
       bm_elt.title = drop_data.url_title;
 
       BookmarkDragData bm_drag_data;
       bm_drag_data.elements.push_back(bm_elt);
 
-      bm_drag_data.Write(tab_contents()->profile(), data);
+      // Pass in NULL as the profile so that the bookmark always adds the url
+      // rather than trying to move an existing url.
+      bm_drag_data.Write(NULL, data);
     } else {
       data->SetURL(drop_data.url, drop_data.url_title);
     }
   }
   if (!drop_data.plain_text.empty())
     data->SetString(drop_data.plain_text);
 
   scoped_refptr<WebDragSource> drag_source(
       new WebDragSource(GetNativeView(), tab_contents()->render_view_host()));
 
@@ skipping 442 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }