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

Unified Diff: chrome/test/base/testing_browser_process.h

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: views_delegate.h deletion 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
Index: chrome/test/base/testing_browser_process.h
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index e5c573b9f5dff5cb33c615aa3691d14672c0fdc0..8fc19908f0d9e362407aa0b9fe563c9d2e29f86a 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -38,10 +38,6 @@ namespace prerender {
class PrerenderTracker;
}
-namespace ui {
-class Clipboard;
-}
-
class TestingBrowserProcess : public BrowserProcess {
public:
TestingBrowserProcess();
@@ -70,7 +66,6 @@ class TestingBrowserProcess : public BrowserProcess {
virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE;
#endif // defined(OS_CHROMEOS)
- virtual ui::Clipboard* clipboard() OVERRIDE;
virtual extensions::EventRouterForwarder*
extension_event_router_forwarder() OVERRIDE;
virtual NotificationUIManager* notification_ui_manager() OVERRIDE;
@@ -115,7 +110,6 @@ class TestingBrowserProcess : public BrowserProcess {
private:
scoped_ptr<content::NotificationService> notification_service_;
unsigned int module_ref_count_;
- scoped_ptr<ui::Clipboard> clipboard_;
std::string app_locale_;
// Weak pointer.

Powered by Google App Engine
This is Rietveld 408576698