Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2086)

Unified Diff: chrome/browser/browser_process_impl.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 798c40014f70e1bb2a401d5e5d9d91aaa1fa3362..0b0524eff94207064d5217325cd3c235cc62e1fc 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -78,7 +78,6 @@
#include "content/public/common/pepper_plugin_info.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context_getter.h"
-#include "ui/base/clipboard/clipboard.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(ENABLE_CONFIGURATION_POLICY)
@@ -142,7 +141,6 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
thumbnail_generator_(new ThumbnailGenerator),
download_status_updater_(new DownloadStatusUpdater) {
g_browser_process = this;
- clipboard_.reset(new ui::Clipboard);
#if defined(ENABLE_PRINTING)
// Must be created after the NotificationService.
@@ -388,11 +386,6 @@ PrefService* BrowserProcessImpl::local_state() {
return local_state_.get();
}
-ui::Clipboard* BrowserProcessImpl::clipboard() {
- DCHECK(CalledOnValidThread());
- return clipboard_.get();
-}
-
net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() {
DCHECK(CalledOnValidThread());
return io_thread()->system_url_request_context_getter();
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698