summaryrefslogtreecommitdiffstats
path: root/views/widget
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 /views/widget
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 'views/widget')
-rw-r--r--views/widget/drop_target_win.cc4
-rw-r--r--views/widget/drop_target_win.h6
-rw-r--r--views/widget/root_view_win.cc4
3 files changed, 7 insertions, 7 deletions
diff --git a/views/widget/drop_target_win.cc b/views/widget/drop_target_win.cc
index 168cd22..e4d1069 100644
--- a/views/widget/drop_target_win.cc
+++ b/views/widget/drop_target_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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,7 @@
namespace views {
DropTargetWin::DropTargetWin(RootView* root_view)
- : BaseDropTarget(root_view->GetWidget()->GetNativeView()),
+ : app::win::DropTarget(root_view->GetWidget()->GetNativeView()),
helper_(root_view) {
}
diff --git a/views/widget/drop_target_win.h b/views/widget/drop_target_win.h
index 75949a9..75884ac 100644
--- a/views/widget/drop_target_win.h
+++ b/views/widget/drop_target_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -6,7 +6,7 @@
#define VIEWS_WIDGET_DROP_TARGET_WIN_H_
#pragma once
-#include "base/base_drop_target.h"
+#include "app/win/drop_target.h"
#include "views/widget/drop_helper.h"
namespace views {
@@ -19,7 +19,7 @@ class View;
//
// DropTargetWin uses DropHelper to manage the appropriate view to target
// drop messages at.
-class DropTargetWin : public BaseDropTarget {
+class DropTargetWin : public app::win::DropTarget {
public:
explicit DropTargetWin(RootView* root_view);
virtual ~DropTargetWin();
diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index 126513f..5f4a088 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -7,7 +7,7 @@
#include "app/drag_drop_types.h"
#include "app/os_exchange_data.h"
#include "app/os_exchange_data_provider_win.h"
-#include "base/base_drag_source.h"
+#include "app/win/drag_source.h"
#include "gfx/canvas_skia.h"
namespace views {
@@ -38,7 +38,7 @@ void RootView::StartDragForViewFromMouseEvent(
int operation) {
// NOTE: view may be null.
drag_view_ = view;
- scoped_refptr<BaseDragSource> drag_source(new BaseDragSource);
+ scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource);
DWORD effects;
DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source,
DragDropTypes::DragOperationToDropEffect(operation), &effects);