chrome/browser/ui/views/omnibox/omnibox_view_win.cc - Issue 10911074: Change how ui::Clipboard is accessed so there's only one per thread.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.cc

Issue 10911074: Change how ui::Clipboard is accessed so there's only one per thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes for kaiwang Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc

diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc

index d620d9ee9b3a1e038b8a06b9d8433b7e712a5fa3..68ed87106ee15ab0c7eb536fb2214b1a73883311 100644

--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc

+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc

@@ -27,7 +27,6 @@

#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"

@@ -1333,7 +1332,7 @@ void OmniboxViewWin::OnCopy() {

// 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::ScopedClipboardWriter scw(ui::Clipboard::GetForCurrentThread(),

ui::Clipboard::BUFFER_STANDARD);

scw.WriteText(text);

if (write_url)