"Paste and go" state was being calculated wrong on views (at least). Fix by making this calculatio…

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

 // Copyright (c) 2012 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 1008 matching lines @@
     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) {
         if (event.source_operations()== ui::DragDropTypes::DRAG_MOVE)
           MoveSelectedText(string_drop_position);
         else
           InsertText(string_drop_position, text);
       } else {
-        PasteAndGo(CollapseWhitespace(text, true));
+        string16 collapsed_text(CollapseWhitespace(text, true));
+        if (model_->CanPasteAndGo(collapsed_text))
+          model_->PasteAndGo(collapsed_text);
       }
       return CopyOrLinkDragOperation(event.source_operations());
     }
   }
 
   return ui::DragDropTypes::DRAG_NONE;
 }
 
-void OmniboxViewWin::PasteAndGo(const string16& text) {
-  if (CanPasteAndGo(text))
-    model_->PasteAndGo();
-}
-
 bool OmniboxViewWin::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
   ui::KeyboardCode key = event.key_code();
   // We don't process ALT + numpad digit as accelerators, they are used for
   // entering special characters.  We do translate alt-home.
   if (event.IsAltDown() && (key != ui::VKEY_HOME) &&
       views::NativeTextfieldWin::IsNumPadDigit(key,
           (event.flags() & ui::EF_EXTENDED) != 0))
     return true;
 
@@ skipping 51 matching lines @@
 bool OmniboxViewWin::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
 bool OmniboxViewWin::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case IDS_UNDO:         return !!CanUndo();
     case IDC_CUT:          return !!CanCut();
     case IDC_COPY:         return !!CanCopy();
     case IDC_PASTE:        return !!CanPaste();
-    case IDS_PASTE_AND_GO: return CanPasteAndGo(GetClipboardText());
+    case IDS_PASTE_AND_GO: return model_->CanPasteAndGo(GetClipboardText());
     case IDS_SELECT_ALL:   return !!CanSelectAll();
     case IDS_EDIT_SEARCH_ENGINES:
       return command_updater_->IsCommandEnabled(IDC_EDIT_SEARCH_ENGINES);
     default:
       NOTREACHED();
       return false;
   }
 }
 
 bool OmniboxViewWin::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return parent_view_->GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
 bool OmniboxViewWin::IsItemForCommandIdDynamic(int command_id) const {
   // No need to change the default IDS_PASTE_AND_GO label unless this is a
   // search.
   return command_id == IDS_PASTE_AND_GO;
 }
 
 string16 OmniboxViewWin::GetLabelForCommandId(int command_id) const {
   DCHECK_EQ(IDS_PASTE_AND_GO, command_id);
-  return l10n_util::GetStringUTF16(model_->is_paste_and_search() ?
+  return l10n_util::GetStringUTF16(
+      model_->IsPasteAndSearch(GetClipboardText()) ?
       IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO);
 }
 
 void OmniboxViewWin::ExecuteCommand(int command_id) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   if (command_id == IDS_PASTE_AND_GO) {
     // This case is separate from the switch() below since we don't want to wrap
     // it in OnBefore/AfterPossibleChange() calls.
-    model_->PasteAndGo();
+    model_->PasteAndGo(GetClipboardText());
     return;
   }
 
   OnBeforePossibleChange();
   switch (command_id) {
     case IDS_UNDO:
       Undo();
       break;
 
     case IDC_CUT:
@@ skipping 1297 matching lines @@
   LineTo(hdc, clip_rect.left, clip_rect.bottom);
   DeleteObject(SelectObject(hdc, last_pen));
 }
 
 void OmniboxViewWin::TextChanged() {
   ScopedFreeze freeze(this, GetTextObjectModel());
   EmphasizeURLComponents();
   model_->OnChanged();
 }
 
-bool OmniboxViewWin::CanPasteAndGo(const string16& text) const {
-  return !popup_window_mode_ && model_->CanPasteAndGo(text);
-}
-
 ITextDocument* OmniboxViewWin::GetTextObjectModel() const {
   if (!text_object_model_) {
     // This is lazily initialized, instead of being initialized in the
     // constructor, in order to avoid hurting startup performance.
     base::win::ScopedComPtr<IRichEditOle, NULL> ole_interface;
     ole_interface.Attach(GetOleInterface());
     if (ole_interface) {
       ole_interface.QueryInterface(
           __uuidof(ITextDocument),
           reinterpret_cast<void**>(&text_object_model_));
@@ skipping 192 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;
 }