| Index: app/win/drag_source.cc
|
| ===================================================================
|
| --- app/win/drag_source.cc (revision 62848)
|
| +++ app/win/drag_source.cc (working copy)
|
| @@ -1,20 +1,16 @@
|
| -// 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.
|
|
|
| -#include "base/base_drag_source.h"
|
| +#include "app/win/drag_source.h"
|
|
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -// BaseDragSource, public:
|
| +namespace app {
|
| +namespace win {
|
|
|
| -BaseDragSource::BaseDragSource() : cancel_drag_(false) {
|
| +DragSource::DragSource() : cancel_drag_(false) {
|
| }
|
|
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -// BaseDragSource, IDropSource implementation:
|
| -
|
| -HRESULT BaseDragSource::QueryContinueDrag(BOOL escape_pressed,
|
| - DWORD key_state) {
|
| +HRESULT DragSource::QueryContinueDrag(BOOL escape_pressed, DWORD key_state) {
|
| if (cancel_drag_)
|
| return DRAGDROP_S_CANCEL;
|
|
|
| @@ -32,14 +28,11 @@
|
| return S_OK;
|
| }
|
|
|
| -HRESULT BaseDragSource::GiveFeedback(DWORD effect) {
|
| +HRESULT DragSource::GiveFeedback(DWORD effect) {
|
| return DRAGDROP_S_USEDEFAULTCURSORS;
|
| }
|
|
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -// BaseDragSource, IUnknown implementation:
|
| -
|
| -HRESULT BaseDragSource::QueryInterface(const IID& iid, void** object) {
|
| +HRESULT DragSource::QueryInterface(const IID& iid, void** object) {
|
| *object = NULL;
|
| if (IsEqualIID(iid, IID_IUnknown) || IsEqualIID(iid, IID_IDropSource)) {
|
| *object = this;
|
| @@ -50,12 +43,15 @@
|
| return S_OK;
|
| }
|
|
|
| -ULONG BaseDragSource::AddRef() {
|
| - base::RefCountedThreadSafe<BaseDragSource>::AddRef();
|
| +ULONG DragSource::AddRef() {
|
| + base::RefCountedThreadSafe<DragSource>::AddRef();
|
| return 0;
|
| }
|
|
|
| -ULONG BaseDragSource::Release() {
|
| - base::RefCountedThreadSafe<BaseDragSource>::Release();
|
| +ULONG DragSource::Release() {
|
| + base::RefCountedThreadSafe<DragSource>::Release();
|
| return 0;
|
| }
|
| +
|
| +} // namespace win
|
| +} // namespace app
|
|
|