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

Unified Diff: webkit/port/page/chromium/EventHandlerChromium.cpp

Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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 | « webkit/port/page/chromium/DragControllerChromium.cpp ('k') | webkit/port/page/chromium/FrameChromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/port/page/chromium/EventHandlerChromium.cpp
===================================================================
--- webkit/port/page/chromium/EventHandlerChromium.cpp (revision 0)
+++ webkit/port/page/chromium/EventHandlerChromium.cpp (working copy)
@@ -26,7 +26,6 @@
#include "config.h"
#include "EventHandler.h"
-#include "ClipboardWin.h"
#include "Cursor.h"
#include "FloatPoint.h"
#include "FocusController.h"
@@ -41,9 +40,13 @@
#include "PlatformWheelEvent.h"
#include "RenderWidget.h"
#include "SelectionController.h"
-#include "WCDataObject.h"
#include "NotImplemented.h"
+#if PLATFORM(WIN)
+#include "ClipboardWin.h"
+#include "WCDataObject.h"
+#endif
+
namespace WebCore {
unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
@@ -136,9 +139,13 @@
PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
{
+#if PLATFORM(WIN)
COMPtr<WCDataObject> dataObject;
WCDataObject::createInstance(&dataObject);
return ClipboardWin::create(true, dataObject.get(), ClipboardWritable);
+#else
+ return PassRefPtr<Clipboard>(0);
+#endif
}
void EventHandler::focusDocumentView()
Property changes on: webkit\port\page\chromium\EventHandlerChromium.cpp
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/page/EventHandlerWin.cpp:r69-2775
« no previous file with comments | « webkit/port/page/chromium/DragControllerChromium.cpp ('k') | webkit/port/page/chromium/FrameChromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698