summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-17 20:44:38 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-17 20:44:38 +0000
commit79a4c1e532a74ac74d72f883e52e30019fe9e731 (patch)
tree2fc9915dc6e1fe9c4b9bea3bdda5ef211da49980 /webkit/tools
parent13147160ae28933269024ba973f0a1ae3d11a57d (diff)
downloadchromium_src-79a4c1e532a74ac74d72f883e52e30019fe9e731.zip
chromium_src-79a4c1e532a74ac74d72f883e52e30019fe9e731.tar.gz
chromium_src-79a4c1e532a74ac74d72f883e52e30019fe9e731.tar.bz2
Move BaseDropTarget and BaseDragSource from base to app/win. Remove the "Base" class name prefix and put in the app::win namespace.
TEST=none BUG=none Review URL: http://codereview.chromium.org/3822007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/drag_delegate.h14
-rw-r--r--webkit/tools/test_shell/drop_delegate.cc7
-rw-r--r--webkit/tools/test_shell/drop_delegate.h45
3 files changed, 33 insertions, 33 deletions
diff --git a/webkit/tools/test_shell/drag_delegate.h b/webkit/tools/test_shell/drag_delegate.h
index 1fde8e4..d1f4e26 100644
--- a/webkit/tools/test_shell/drag_delegate.h
+++ b/webkit/tools/test_shell/drag_delegate.h
@@ -1,27 +1,27 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-//
-// A class that implements BaseDragSource for the test shell webview delegate.
#ifndef WEBKIT_TOOLS_TEST_SHELL_DRAG_DELEGATE_H__
#define WEBKIT_TOOLS_TEST_SHELL_DRAG_DELEGATE_H__
-#include "base/base_drag_source.h"
+#include "app/win/drag_source.h"
namespace WebKit {
class WebView;
}
-class TestDragDelegate : public BaseDragSource {
+// A class that implements app::win::DragSource for the test shell webview
+// delegate.
+class TestDragDelegate : public app::win::DragSource {
public:
TestDragDelegate(HWND source_hwnd, WebKit::WebView* webview)
- : BaseDragSource(),
+ : app::win::DragSource(),
source_hwnd_(source_hwnd),
webview_(webview) { }
protected:
- // BaseDragSource
+ // app::win::DragSource
virtual void OnDragSourceCancel();
virtual void OnDragSourceDrop();
virtual void OnDragSourceMove();
diff --git a/webkit/tools/test_shell/drop_delegate.cc b/webkit/tools/test_shell/drop_delegate.cc
index daa915a..63e0e28 100644
--- a/webkit/tools/test_shell/drop_delegate.cc
+++ b/webkit/tools/test_shell/drop_delegate.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,7 +14,10 @@ using WebKit::WebDragOperationCopy;
using WebKit::WebPoint;
using WebKit::WebView;
-// BaseDropTarget methods ----------------------------------------------------
+TestDropDelegate::TestDropDelegate(HWND source_hwnd, WebKit::WebView* webview)
+ : app::win::DropTarget(source_hwnd),
+ webview_(webview) {
+}
DWORD TestDropDelegate::OnDragEnter(IDataObject* data_object,
DWORD key_state,
diff --git a/webkit/tools/test_shell/drop_delegate.h b/webkit/tools/test_shell/drop_delegate.h
index 8a1442a..1e13c77 100644
--- a/webkit/tools/test_shell/drop_delegate.h
+++ b/webkit/tools/test_shell/drop_delegate.h
@@ -1,43 +1,40 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// A class that implements BaseDropTarget for the test shell webview delegate.
-#ifndef WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H__
-#define WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H__
+#ifndef WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H_
+#define WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H_
-#include "base/base_drop_target.h"
+#include "app/win/drop_target.h"
namespace WebKit {
class WebView;
}
-class TestDropDelegate : public BaseDropTarget {
+class TestDropDelegate : public app::win::DropTarget {
public:
- TestDropDelegate(HWND source_hwnd, WebKit::WebView* webview)
- : BaseDropTarget(source_hwnd),
- webview_(webview) { }
+ TestDropDelegate(HWND source_hwnd, WebKit::WebView* webview);
protected:
- // BaseDropTarget methods
- virtual DWORD OnDragEnter(IDataObject* data_object,
- DWORD key_state,
- POINT cursor_position,
- DWORD effect);
- virtual DWORD OnDragOver(IDataObject* data_object,
- DWORD key_state,
- POINT cursor_position,
- DWORD effect);
- virtual void OnDragLeave(IDataObject* data_object);
- virtual DWORD OnDrop(IDataObject* data_object,
- DWORD key_state,
- POINT cursor_position,
- DWORD effect);
-
+ // BaseDropTarget methods
+ virtual DWORD OnDragEnter(IDataObject* data_object,
+ DWORD key_state,
+ POINT cursor_position,
+ DWORD effect);
+ virtual DWORD OnDragOver(IDataObject* data_object,
+ DWORD key_state,
+ POINT cursor_position,
+ DWORD effect);
+ virtual void OnDragLeave(IDataObject* data_object);
+ virtual DWORD OnDrop(IDataObject* data_object,
+ DWORD key_state,
+ POINT cursor_position,
+ DWORD effect);
private:
WebKit::WebView* webview_;
};
-#endif // WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H__
+#endif // WEBKIT_TOOLS_TEST_SHELL_DROP_DELEGATE_H_