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

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 16 matching lines @@
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 68 matching lines @@
   const OmniboxViewWin::State view_state;
 };
 
 // Returns true if the current point is far enough from the origin that it
 // would be considered a drag.
 bool IsDrag(const POINT& origin, const POINT& current) {
   return views::View::ExceededDragThreshold(current.x - origin.x,
                                             current.y - origin.y);
 }
 
+// Write |text| and an optional |url| to the clipboard.
+void DoCopy(const string16& text, const GURL* url) {
+  ui::ScopedClipboardWriter scw(g_browser_process->clipboard(),
+                                ui::Clipboard::BUFFER_STANDARD);
+  scw.WriteText(text);
+  if (url != NULL)
+    scw.WriteBookmark(text, url->spec());
+}
+
 }  // namespace
 
 // EditDropTarget is the IDropTarget implementation installed on
 // OmniboxViewWin. EditDropTarget prefers URL over plain text. A drop
 // of a URL replaces all the text of the edit and navigates immediately to the
 // URL. A drop of plain text from the same edit either copies or moves the
 // selected text, and a drop of plain text from a source other than the edit
 // does a paste and go.
 class OmniboxViewWin::EditDropTarget : public ui::DropTarget {
  public:
@@ skipping 873 matching lines @@
         if (model()->CanPasteAndGo(collapsed_text))
           model()->PasteAndGo(collapsed_text);
       }
       return CopyOrLinkDragOperation(event.source_operations());
     }
   }
 
   return ui::DragDropTypes::DRAG_NONE;
 }
 
+void OmniboxViewWin::CopyURL() {
+  DoCopy(toolbar_model()->GetText(false), &toolbar_model()->GetURL());
+}
+
 bool OmniboxViewWin::SkipDefaultKeyEventProcessing(const ui::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;
 
   // Skip accelerators for key combinations omnibox wants to crack. This list
@@ skipping 46 matching lines @@
   ::MapWindowPoints(NULL, m_hWnd, &client_point, 1);
   SendMessage(msg, flags, MAKELPARAM(client_point.x, client_point.y));
 }
 
 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 model()->CanPasteAndGo(GetClipboardText());
-    case IDS_SELECT_ALL:   return !!CanSelectAll();
+    case IDS_UNDO:
+      return !!CanUndo();
+    case IDC_CUT:
+      return !!CanCut();
+    case IDC_COPY:
+      return !!CanCopy();
+    case IDC_COPY_URL:
+      return !!CanCopy() &&
+          !model()->user_input_in_progress() &&
+          toolbar_model()->WouldReplaceSearchURLWithSearchTerms();
+    case IDC_PASTE:
+      return !!CanPaste();
+    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,
@@ skipping 30 matching lines @@
       break;
 
     case IDC_CUT:
       Cut();
       break;
 
     case IDC_COPY:
       Copy();
       break;
 
+    case IDC_COPY_URL:
+      CopyURL();
+      break;
+
     case IDC_PASTE:
       Paste();
       break;
 
     case IDS_SELECT_ALL:
       SelectAll(false);
       break;
 
     case IDS_EDIT_SEARCH_ENGINES:
       command_updater()->ExecuteCommand(IDC_EDIT_SEARCH_ENGINES);
@@ skipping 176 matching lines @@
   if (text.empty())
     return;
 
   CHARRANGE sel;
   GURL url;
   bool write_url = false;
   GetSel(sel);
   // GetSel() doesn't preserve selection direction, so sel.cpMin will always be
   // the smaller value.
   model()->AdjustTextForCopy(sel.cpMin, IsSelectAll(), &text, &url, &write_url);
-  ui::ScopedClipboardWriter scw(g_browser_process->clipboard(),
-                                ui::Clipboard::BUFFER_STANDARD);
-  scw.WriteText(text);
-  if (write_url)
-    scw.WriteBookmark(text, url.spec());
+

[Peter Kasting, 2012/09/11 21:52:59]

Nit: Blank line unnecessary

[dominich, 2012/09/12 15:23:09]

Done.

+  DoCopy(text, write_url ? &url : NULL);
 }
 
 LRESULT OmniboxViewWin::OnCreate(const CREATESTRUCTW* /*create_struct*/) {
   if (base::win::IsTsfAwareRequired()) {
     // Enable TSF support of RichEdit.
     SetEditStyle(SES_USECTF, SES_USECTF);
   }
   SetMsgHandled(FALSE);
   return 0;
 }
@@ skipping 1239 matching lines @@
 
   context_menu_contents_.reset(new ui::SimpleMenuModel(this));
   // Set up context menu.
   if (popup_window_mode_) {
     context_menu_contents_->AddItemWithStringId(IDC_COPY, IDS_COPY);
   } else {
     context_menu_contents_->AddItemWithStringId(IDS_UNDO, IDS_UNDO);
     context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_contents_->AddItemWithStringId(IDC_CUT, IDS_CUT);
     context_menu_contents_->AddItemWithStringId(IDC_COPY, IDS_COPY);
+    if (chrome::search::IsInstantExtendedAPIEnabled(parent_view_->profile()))
+      context_menu_contents_->AddItemWithStringId(IDC_COPY_URL, IDS_COPY_URL);
     context_menu_contents_->AddItemWithStringId(IDC_PASTE, IDS_PASTE);
     // GetContextualLabel() will override this next label with the
     // IDS_PASTE_AND_SEARCH label as needed.
     context_menu_contents_->AddItemWithStringId(IDS_PASTE_AND_GO,
                                                 IDS_PASTE_AND_GO);
     context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL, IDS_SELECT_ALL);
     context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
@@ skipping 31 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }