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(UTF8ToUTF16(url.spec()));
+      bool changed = StripJavascriptSchema(text, &text);
+      SetUserText(text);
+      if (!changed)
+        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 740 matching lines @@
 
   // Blit the memory DC to the actual paint DC and clean up.
   BitBlt(paint_dc, rect.left, rect.top, rect.Width(), rect.Height(), memory_dc,
          rect.left, rect.top, SRCCOPY);
   memory_dc.SelectBitmap(old_bitmap);
   edit_hwnd = old_edit_hwnd;
 }
 
 void OmniboxViewWin::OnPaste() {
   // Replace the selection if we have something to paste.
-  const string16 text(GetClipboardText());
+  string16 text(GetClipboardText());
+  StripJavascriptSchema(text, &text);

[Peter Kasting, 2011/05/10 23:27:42]

You should be doing this fixup in GetClipboardText(), not here.

[Cris Neckar, 2011/05/11 21:42:36]

Done.

   if (!text.empty()) {
     // Record this paste, so we can do different behavior.
     model_->on_paste();
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted into the
     // text box.
     text_before_change_.clear();
     ReplaceSel(text.c_str(), true);
   }
 }
@@ skipping 861 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;
 }