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

Unified Diff: ui/base/clipboard/clipboard.h

Issue 17285002: ui::Clipboard now uses base::win::MessageWindow to create a message-only window on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « no previous file | ui/base/clipboard/clipboard_win.cc » ('j') | ui/base/clipboard/clipboard_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard.h
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index a827d2607088f8f4d5c6a4cd874d06a4a63c584f..816e0450ecfc5e6616536b7ef0aba5b207e49f12 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -31,7 +31,7 @@
#include "base/android/scoped_java_ref.h"
#endif
-#if defined(USE_AURA) && defined(USE_X11)
+#if (defined(USE_AURA) && defined(USE_X11)) || defined(OS_WIN)
#include "base/memory/scoped_ptr.h"
#endif
@@ -315,6 +315,8 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
#endif
private:
+ class ClipboardWindow;
+
FRIEND_TEST_ALL_PREFIXES(ClipboardTest, SharedBitmapTest);
FRIEND_TEST_ALL_PREFIXES(ClipboardTest, EmptyHTMLTest);
friend class ClipboardTest;
@@ -364,10 +366,8 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
HWND GetClipboardWindow() const;
// Mark this as mutable so const methods can still do lazy initialization.
- mutable HWND clipboard_owner_;
+ mutable scoped_ptr<ClipboardWindow> clipboard_owner_;
- // True if we can create a window.
- bool create_window_;
#elif defined(TOOLKIT_GTK)
// The public API is via WriteObjects() which dispatches to multiple
// Write*() calls, but on GTK we must write all the clipboard types
« no previous file with comments | « no previous file | ui/base/clipboard/clipboard_win.cc » ('j') | ui/base/clipboard/clipboard_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698