Change the ChromiumPasteboard to have a notion of an alternate clipboard...

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2009 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/autocomplete/autocomplete_edit_view_win.h"
 
 #include <locale>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 2162 matching lines @@
 
 void AutocompleteEditViewWin::TextChanged() {
   ScopedFreeze freeze(this, GetTextObjectModel());
   EmphasizeURLComponents();
   controller_->OnChanged();
 }
 
 std::wstring AutocompleteEditViewWin::GetClipboardText() const {
   // Try text format.
   Clipboard* clipboard = g_browser_process->clipboard();
-  if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) {
+  if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(),
+                                   Clipboard::BUFFER_STANDARD)) {
     std::wstring text;
-    clipboard->ReadText(&text);
+    clipboard->ReadText(Clipboard::BUFFER_STANDARD, &text);
 
     // Note: Unlike in the find popup and textfield view, here we completely
     // remove whitespace strings containing newlines.  We assume users are
     // most likely pasting in URLs that may have been split into multiple
     // lines in terminals, email programs, etc., and so linebreaks indicate
     // completely bogus whitespace that would just cause the input to be
     // invalid.
     return CollapseWhitespace(text, true);
   }
 
   // Try bookmark format.
   //
   // It is tempting to try bookmark format first, but the URL we get out of a
   // bookmark has been cannonicalized via GURL.  This means if a user copies
   // and pastes from the URL bar to itself, the text will get fixed up and
   // cannonicalized, which is not what the user expects.  By pasting in this
   // order, we are sure to paste what the user copied.
-  if (clipboard->IsFormatAvailable(Clipboard::GetUrlWFormatType())) {
+  if (clipboard->IsFormatAvailable(Clipboard::GetUrlWFormatType(),
+                                   Clipboard::BUFFER_STANDARD)) {
     std::string url_str;
     clipboard->ReadBookmark(NULL, &url_str);
     // pass resulting url string through GURL to normalize
     GURL url(url_str);
     if (url.is_valid())
       return UTF8ToWide(url.spec());
   }
 
   return std::wstring();
 }
@@ skipping 155 matching lines @@
     context_menu_contents_->AddItemWithStringId(IDS_PASTE_AND_GO,
                                                 IDS_PASTE_AND_GO);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL, IDS_SELECT_ALL);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
   }
   context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
 }