Make it so the user can't drag javascript: links to the

desktop from web content or the bookmarks bar.  Maintain
the ability to drag javascript: links from web content
to the bookmarks bar or to drag the javascript: link as
plain text.

BUG=3431
Review URL: http://codereview.chromium.org/8638

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4050 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc
index 85911a7..c55d24f 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 
 #include "base/pickle.h"
+#include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/os_exchange_data.h"
@@ -82,8 +83,13 @@ void BookmarkDragData::Write(Profile* profile, OSExchangeData* data) const {
 
   // If there is only one element and it is a URL, write the URL to the
   // clipboard.
-  if (elements.size() == 1 && elements[0].is_url)
-    data->SetURL(elements[0].url, elements[0].title);
+  if (elements.size() == 1 && elements[0].is_url) {
+    if (elements[0].url.SchemeIs("javascript")) {
+      data->SetString(ASCIIToWide(elements[0].url.spec()));
+    } else {
+      data->SetURL(elements[0].url, elements[0].title);
+    }
+  }
 
   Pickle data_pickle;
   data_pickle.WriteWString(profile->GetPath());