Strip leading "javascript:" schemas from text pasted or dropped into the omnibox.

chrome/browser/ui/views/omnibox/omnibox_view_win.cc

 // Copyright (c) 2011 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/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 940 matching lines @@
 }
 
 int OmniboxViewWin::OnPerformDropImpl(const views::DropTargetEvent& event,
                                       bool in_drag) {
   const ui::OSExchangeData& data = event.data();
 
   if (data.HasURL()) {
     GURL url;
     string16 title;
     if (data.GetURLAndTitle(&url, &title)) {
-      SetUserText(UTF8ToWide(url.spec()));
-      model()->AcceptInput(CURRENT_TAB, true);
+      string16 text(views::StripJavascriptSchemas(UTF8ToUTF16(url.spec())));
+      SetUserText(text);
+      if (url.spec().length() == text.length())
+        model()->AcceptInput(CURRENT_TAB, true);
       return CopyOrLinkDragOperation(event.source_operations());
     }
   } else if (data.HasString()) {
     int string_drop_position = drop_highlight_position();
     string16 text;
     if ((string_drop_position != -1 || !in_drag) && data.GetString(&text)) {
       DCHECK(string_drop_position == -1 ||
              ((string_drop_position >= 0) &&
               (string_drop_position <= GetTextLength())));
       if (in_drag) {
@@ skipping 1376 matching lines @@
   model_->OnChanged();
 }
 
 string16 OmniboxViewWin::GetClipboardText() const {
   // Try text format.
   ui::Clipboard* clipboard = g_browser_process->clipboard();
   if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
                                    ui::Clipboard::BUFFER_STANDARD)) {
     string16 text;
     clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &text);
-
+    string16 stripped_text(views::StripJavascriptSchemas(text));

[Peter Kasting, 2011/05/24 00:15:18]

Nit: Just inline this into the next statement

[Cris Neckar, 2011/05/24 17:09:40]

Done.

     // Note: Unlike in the find popup and textfield view, here we completely
     // remove whitespace strings containing newlines.  We assume users are
     // most likely pasting in URLs that may have been split into multiple
     // lines in terminals, email programs, etc., and so linebreaks indicate
     // completely bogus whitespace that would just cause the input to be
     // invalid.
-    return CollapseWhitespace(text, true);
+    return CollapseWhitespace(stripped_text, true);
   }
 
   // Try bookmark format.
   //
   // It is tempting to try bookmark format first, but the URL we get out of a
   // bookmark has been cannonicalized via GURL.  This means if a user copies
   // and pastes from the URL bar to itself, the text will get fixed up and
   // cannonicalized, which is not what the user expects.  By pasting in this
   // order, we are sure to paste what the user copied.
   if (clipboard->IsFormatAvailable(ui::Clipboard::GetUrlWFormatType(),
                                    ui::Clipboard::BUFFER_STANDARD)) {
     std::string url_str;
     clipboard->ReadBookmark(NULL, &url_str);
     // pass resulting url string through GURL to normalize
     GURL url(url_str);
     if (url.is_valid())
-      return UTF8ToWide(url.spec());
+      return views::StripJavascriptSchemas(UTF8ToUTF16(url.spec()));
   }
 
   return string16();
 }
 
 bool OmniboxViewWin::CanPasteAndGo(const string16& text) const {
   return !popup_window_mode_ && model_->CanPasteAndGo(text);
 }
 
 ITextDocument* OmniboxViewWin::GetTextObjectModel() const {
@@ skipping 201 matching lines @@
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
 
 bool OmniboxViewWin::IsCaretAtEnd() const {
   long length = GetTextLength();
   CHARRANGE sel;
   GetSelection(sel);
   return sel.cpMin == sel.cpMax && sel.cpMin == length;
 }