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

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.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/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
@@ skipping 1300 matching lines @@
   GtkWidget* search_engine_menuitem = gtk_menu_item_new_with_mnemonic(
       ui::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_EDIT_SEARCH_ENGINES)).c_str());
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), search_engine_menuitem);
   g_signal_connect(search_engine_menuitem, "activate",
                    G_CALLBACK(HandleEditSearchEnginesThunk), this);
   gtk_widget_set_sensitive(search_engine_menuitem,
       command_updater_->IsCommandEnabled(IDC_EDIT_SEARCH_ENGINES));
   gtk_widget_show(search_engine_menuitem);
 
-  // We need to update the paste and go controller before we know what text
-  // to show. We could do this all asynchronously, but it would be elaborate
-  // because we'd have to account for multiple menus showing, getting called
-  // back after shutdown, and similar issues.
-  GtkClipboard* x_clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-  gchar* text = gtk_clipboard_wait_for_text(x_clipboard);
-  string16 sanitized_text(text ?
-      StripJavascriptSchemas(CollapseWhitespace(UTF8ToUTF16(text), true)) :
-      string16());
-  g_free(text);
-
-  // Paste and Go menu item. Note that CanPasteAndGo() needs to be called
-  // before is_paste_and_search() in order to set up the paste-and-go state.
-  bool can_paste_and_go = model_->CanPasteAndGo(sanitized_text);
-  GtkWidget* paste_go_menuitem = gtk_menu_item_new_with_mnemonic(
-      ui::ConvertAcceleratorsFromWindowsStyle(
-          l10n_util::GetStringUTF8(model_->is_paste_and_search() ?
-              IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO)).c_str());
-
   // Detect the Paste menu item by searching for the one that
   // uses the stock Paste label (i.e. gtk-paste).
   string16 stock_paste_label(UTF8ToUTF16(GTK_STOCK_PASTE));
   GList* list = gtk_container_get_children(GTK_CONTAINER(menu));
   guint index = 1;
   for (GList* item = list; item != NULL; item = item->next, ++index) {
     if (GTK_IS_IMAGE_MENU_ITEM(item->data)) {
       gboolean is_stock = gtk_image_menu_item_get_use_stock(
           GTK_IMAGE_MENU_ITEM(item->data));
       if (is_stock) {
         string16 menu_item_label
             (UTF8ToUTF16(gtk_menu_item_get_label(GTK_MENU_ITEM(item->data))));
         if (menu_item_label == stock_paste_label) {
           break;
         }
       }
     }
   }
   g_list_free(list);
 
   // If we don't find the stock Paste menu item,
   // the Paste and Go item will be appended at the end of the popup menu.
+  GtkClipboard* x_clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+  gchar* text = gtk_clipboard_wait_for_text(x_clipboard);
+  string16 sanitized_text_for_paste_and_go_(text ?

[Elliot Glaysher, 2012/07/09 16:29:08]

Is this supposed to be a member variable? It's declared locally, but ends in
"_".

[Peter Kasting, 2012/07/09 17:17:22]

Yes.  Fixed.

+      StripJavascriptSchemas(CollapseWhitespace(UTF8ToUTF16(text), true)) :
+      string16());
+  g_free(text);
+  GtkWidget* paste_go_menuitem = gtk_menu_item_new_with_mnemonic(
+      ui::ConvertAcceleratorsFromWindowsStyle(l10n_util::GetStringUTF8(
+          model_->IsPasteAndSearch(sanitized_text_for_paste_and_go_) ?
+              IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO)).c_str());
   gtk_menu_shell_insert(GTK_MENU_SHELL(menu), paste_go_menuitem, index);
   g_signal_connect(paste_go_menuitem, "activate",
                    G_CALLBACK(HandlePasteAndGoThunk), this);
-  gtk_widget_set_sensitive(paste_go_menuitem, can_paste_and_go);
+  gtk_widget_set_sensitive(paste_go_menuitem,
+      model_->CanPasteAndGo(sanitized_text_for_paste_and_go_));
   gtk_widget_show(paste_go_menuitem);
 
   g_signal_connect(menu, "deactivate",
                    G_CALLBACK(HandlePopupMenuDeactivateThunk), this);
 }
 
 void OmniboxViewGtk::HandleEditSearchEngines(GtkWidget* sender) {
   command_updater_->ExecuteCommand(IDC_EDIT_SEARCH_ENGINES);
 }
 
 void OmniboxViewGtk::HandlePasteAndGo(GtkWidget* sender) {
-  model_->PasteAndGo();
+  model_->PasteAndGo(sanitized_text_for_paste_and_go_);
 }
 
 void OmniboxViewGtk::HandleMarkSet(GtkTextBuffer* buffer,
                                    GtkTextIter* location,
                                    GtkTextMark* mark) {
   if (!text_buffer_ || buffer != text_buffer_)
     return;
 
   if (mark != gtk_text_buffer_get_insert(text_buffer_) &&
       mark != gtk_text_buffer_get_selection_bound(text_buffer_)) {
@@ skipping 299 matching lines @@
                            0);
 
     if (!copy && gtk_text_view_get_editable(GTK_TEXT_VIEW(text_view_)))
       gtk_text_buffer_delete_selection(text_buffer_, true, true);
   }
 
   OwnPrimarySelection(UTF16ToUTF8(text));
 }
 
 bool OmniboxViewGtk::OnPerformDropImpl(const string16& text) {
-  if (model_->CanPasteAndGo(StripJavascriptSchemas(
-      CollapseWhitespace(text, true)))) {
-    model_->PasteAndGo();
+  string16 sanitized_string(StripJavascriptSchemas(
+      CollapseWhitespace(text, true)));
+  if (model_->CanPasteAndGo(sanitized_string)) {
+    model_->PasteAndGo(sanitized_string);
     return true;
   }
 
   return false;
 }
 
 gfx::Font OmniboxViewGtk::GetFont() {
   bool use_gtk = theme_service_->UsingNativeTheme();
   if (use_gtk) {
     // If we haven't initialized the text view yet, just create a temporary one
@@ skipping 537 matching lines @@
 void OmniboxViewGtk::AdjustVerticalAlignmentOfInstantView() {
   // By default, GtkTextView layouts an anchored child widget just above the
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   int baseline = pango_layout_get_baseline(layout);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }