Fixed a clipboard bug in views/omnibox. The content was always copied as pure text, never as hyperl…

chrome/browser/ui/views/omnibox/omnibox_view_views.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_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 97 matching lines @@
 // kAutocompleteEditFontPixelSizeInPopup. They should be changed accordingly
 // if font size for autocomplete edit (in popup) change.
 const int kAutocompleteVerticalMargin = 1;
 const int kAutocompleteVerticalMarginInPopup = 2;
 
 int GetEditFontPixelSize(bool popup_window_mode) {
   return popup_window_mode ? kAutocompleteEditFontPixelSizeInPopup :
                              kAutocompleteEditFontPixelSize;
 }
 
-// Copies |selected_text| as text to the primary clipboard. If |write_url| is
-// true, this will also write |url| and |text| to the clipboard as a well-formed
-// URL.
-void DoCopy(const string16& selected_text,
-            bool write_url,
-            const GURL& url,
-            const string16& text) {
-  ui::Clipboard* cb = ui::Clipboard::GetForCurrentThread();
-  ui::ScopedClipboardWriter scw(cb, ui::Clipboard::BUFFER_STANDARD);
+// Copies |selected_text| as text to the primary clipboard.
+void DoCopyText(const string16& selected_text) {
+  ui::ScopedClipboardWriter scw(ui::Clipboard::GetForCurrentThread(),
+                                ui::Clipboard::BUFFER_STANDARD);
   scw.WriteText(selected_text);
-  if (write_url) {
-    BookmarkNodeData data;
-    data.ReadFromTuple(url, text);
-    data.WriteToClipboard(NULL);
-  }
+}
+
+// This will write |url| and |text| to the clipboard as a well-formed URL.
+void DoCopyURL(const GURL& url, const string16& text) {
+  BookmarkNodeData data;
+  data.ReadFromTuple(url, text);
+  data.WriteToClipboard(NULL);
 }
 
 }  // namespace
 
 // Textfield for autocomplete that intercepts events that are necessary
 // for OmniboxViewViews.
 class OmniboxViewViews::AutocompleteTextfield : public views::Textfield {
  public:
   AutocompleteTextfield(OmniboxViewViews* omnibox_view,
                         LocationBarView* location_bar_view)
@@ skipping 620 matching lines @@
   ui::Range selection_range;
   textfield_->GetSelectedRange(&selection_range);
   ui::Clipboard* cb = ui::Clipboard::GetForCurrentThread();
   string16 selected_text;
   cb->ReadText(ui::Clipboard::BUFFER_STANDARD, &selected_text);
   const string16 text = textfield_->text();
   GURL url;
   bool write_url;
   model()->AdjustTextForCopy(selection_range.GetMin(), selected_text == text,
       &selected_text, &url, &write_url);
-  DoCopy(selected_text, write_url, url, text);
+  if (write_url)
+    DoCopyURL(url, selected_text);
+  else
+    DoCopyText(selected_text);
 }
 
 void OmniboxViewViews::OnWriteDragData(ui::OSExchangeData* data) {
   ui::Range selection_range;
   textfield_->GetSelectedRange(&selection_range);
   string16 selected_text = textfield_->GetSelectedText();
   const string16 text = textfield_->text();
   GURL url;
   bool write_url;
   model()->AdjustTextForCopy(selection_range.start(), selected_text == text,
@@ skipping 162 matching lines @@
     textfield_->SetText(text);
   textfield_->SelectRange(range);
 }
 
 string16 OmniboxViewViews::GetSelectedText() const {
   // TODO(oshima): Support instant, IME.
   return textfield_->GetSelectedText();
 }
 
 void OmniboxViewViews::CopyURL() {
-  const string16& text = toolbar_model()->GetText(false);
-  DoCopy(text, true, toolbar_model()->GetURL(), text);
+  DoCopyURL(toolbar_model()->GetURL(), toolbar_model()->GetText(false));
 }
 
 void OmniboxViewViews::OnPaste() {
   // Replace the selection if we have something to paste.
   const string16 text(GetClipboardText());
   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();
     textfield_->ReplaceSelection(text);
   }
 }