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

Unified Diff: content/shell/shell_aura.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 | « content/browser/renderer_host/clipboard_message_filter.cc ('k') | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_aura.cc
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index b956aec7404d467dd8ae5f04174a5a2c10e843db..ee4efada6c3e52da6675296fe8df4e12313d4a9b 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -52,13 +52,6 @@ class ShellViewsDelegateAura : public ViewsDelegate {
}
// Overridden from ViewsDelegate:
- virtual ui::Clipboard* GetClipboard() const OVERRIDE {
- if (!clipboard_.get()) {
- clipboard_.reset(new ui::Clipboard);
- }
- return clipboard_.get();
- }
-
virtual void SaveWindowPlacement(const Widget* window,
const std::string& window_name,
const gfx::Rect& bounds,
@@ -111,7 +104,6 @@ class ShellViewsDelegateAura : public ViewsDelegate {
}
private:
- mutable scoped_ptr<ui::Clipboard> clipboard_;
bool use_transparent_windows_;
DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura);
« no previous file with comments | « content/browser/renderer_host/clipboard_message_filter.cc ('k') | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698