Add Copy URL option to Omnibox context menu when URL is replaced by Instant Extended.

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 126 matching lines @@
   gtk_text_buffer_get_iter_at_mark(buffer, &insert,
                                    gtk_text_buffer_get_insert(buffer));
   gtk_text_buffer_get_iter_at_mark(buffer, &selection_bound,
                                    gtk_text_buffer_get_selection_bound(buffer));
 
   if (!gtk_text_iter_equal(&insert, &selection_bound)) {
     gtk_text_buffer_move_mark(buffer,
                               gtk_text_buffer_get_selection_bound(buffer),
                               &insert);
   }
 }

[Evan Stade, 2012/09/05 21:07:17]

blank line and function docs

[dominich, 2012/09/05 21:21:39]

Done.

+guint GetPopupMenuIndexForStockLabel(const char* label, GtkMenu* menu) {
+  string16 stock_label(UTF8ToUTF16(label));

[Evan Stade, 2012/09/05 21:07:17]

why do you convert to utf16 before comparison?

[dominich, 2012/09/05 21:21:39]

It's what the original code was doing. It seemed strange to me as UTF8 string
compare should work as expected.

[Evan Stade, 2012/09/05 22:11:50]

well then let's change it.

[dominich, 2012/09/05 23:35:34]

Done.

+  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_label)
+          break;
+      }
+    }
+  }
+  g_list_free(list);
+  return index;
+}
 
 }  // namespace
 
 OmniboxViewGtk::OmniboxViewGtk(OmniboxEditController* controller,
                                ToolbarModel* toolbar_model,
                                Browser* browser,
                                CommandUpdater* command_updater,
                                bool popup_window_mode,
                                GtkWidget* location_bar)
     : OmniboxView(browser->profile(), controller, toolbar_model,
@@ skipping 1092 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);
 
-  // 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);
   sanitized_text_for_paste_and_go_ = text ?
       StripJavascriptSchemas(CollapseWhitespace(UTF8ToUTF16(text), true)) :
       string16();
   g_free(text);
+
+  // Copy URL menu item.
+  if (toolbar_model()->WouldReplaceSearchURLWithSearchTerms() &&
+      !model()->user_input_in_progress()) {
+    GtkWidget* copy_url_menuitem = gtk_menu_item_new_with_mnemonic(
+        ui::ConvertAcceleratorsFromWindowsStyle(
+            l10n_util::GetStringUTF8(IDS_COPY_URL)).c_str());
+    // If we don't find the stock Copy menu item, the Copy URL item will be
+    // appended at the end of the popup menu.
+    gtk_menu_shell_insert(GTK_MENU_SHELL(menu), copy_url_menuitem,
+                          GetPopupMenuIndexForStockLabel(GTK_STOCK_COPY, menu));
+    g_signal_connect(copy_url_menuitem, "activate",
+                     G_CALLBACK(HandleCopyURLClipboardThunk), this);
+    gtk_widget_set_sensitive(copy_url_menuitem,
+                             command_updater()->IsCommandEnabled(IDC_COPY_URL));
+    gtk_widget_show(copy_url_menuitem);
+  }
+
+ // Paste and Go menu item.
   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);
+
+  // Detect the Paste and Copy menu items by searching for the ones that uses
+  // the stock labels (i.e. gtk-paste and gtk-copy).
+
+  // 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.
+  gtk_menu_shell_insert(GTK_MENU_SHELL(menu), paste_go_menuitem,
+                        GetPopupMenuIndexForStockLabel(GTK_STOCK_PASTE, menu));
+
   g_signal_connect(paste_go_menuitem, "activate",
                    G_CALLBACK(HandlePasteAndGoThunk), this);
   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);
 }
 
@@ skipping 267 matching lines @@
   if (handled) {
     static guint signal_id = g_signal_lookup("move-focus", GTK_TYPE_WIDGET);
     g_signal_stop_emission(widget, signal_id, 0);
   }
 }
 
 void OmniboxViewGtk::HandleCopyClipboard(GtkWidget* sender) {
   HandleCopyOrCutClipboard(true);
 }
 
+void OmniboxViewGtk::HandleCopyURLClipboard(GtkWidget* sender) {
+  const string16& text = toolbar_model()->GetText(false);

[Evan Stade, 2012/09/05 21:07:17]

nit: I'd declare these in the order they're used.

[dominich, 2012/09/05 21:21:39]

Done.

+  const GURL& url = toolbar_model()->GetURL();
+
+  BookmarkNodeData data;
+  data.ReadFromTuple(url, text);
+  data.WriteToClipboard(NULL);

[Evan Stade, 2012/09/05 21:07:17]

why don't you pass the profile?

[dominich, 2012/09/05 21:21:39]

the HandleCopyOrCutClipboard method below passes NULL.

[Evan Stade, 2012/09/05 22:11:50]

why does that one pass NULL?

[dominich, 2012/09/05 23:35:34]

we don't want to write the profile path to the bookmark pickle.

[Evan Stade, 2012/09/06 01:35:03]

can you add documentation to BookmarkNodeData::WriteToClipboard since it's not
at all obvious what |profile| is there for? (it seems to only exist for drag and
drop?)

+}
+
 void OmniboxViewGtk::HandleCutClipboard(GtkWidget* sender) {
   HandleCopyOrCutClipboard(false);
 }
 
 void OmniboxViewGtk::HandleCopyOrCutClipboard(bool copy) {
   DCHECK(text_view_);
 
   // On copy or cut, we manually update the PRIMARY selection to contain the
   // highlighted text.  This matches Firefox -- we highlight the URL but don't
   // update PRIMARY on Ctrl-L, so Ctrl-L, Ctrl-C and then middle-click is a
@@ skipping 578 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);
 }