Index: ui/base/dragdrop/drag_drop_types_win.cc |
=================================================================== |
--- ui/base/dragdrop/drag_drop_types_win.cc (revision 71798) |
+++ ui/base/dragdrop/drag_drop_types_win.cc (working copy) |
@@ -1,12 +1,14 @@ |
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 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 "app/drag_drop_types.h" |
+#include "ui/base/dragdrop/drag_drop_types.h" |
#include <oleidl.h> |
-int DragDropTypes::DropEffectToDragOperation( |
+namespace ui { |
+ |
+int ui::DragDropTypes::DropEffectToDragOperation( |
uint32 effect) { |
int drag_operation = DRAG_NONE; |
if (effect & DROPEFFECT_LINK) |
@@ -18,7 +20,7 @@ |
return drag_operation; |
} |
-uint32 DragDropTypes::DragOperationToDropEffect(int drag_operation) { |
+uint32 ui::DragDropTypes::DragOperationToDropEffect(int drag_operation) { |
uint32 drop_effect = DROPEFFECT_NONE; |
if (drag_operation & DRAG_LINK) |
drop_effect |= DROPEFFECT_LINK; |
@@ -28,3 +30,5 @@ |
drop_effect |= DROPEFFECT_MOVE; |
return drop_effect; |
} |
+ |
+} // namespace ui |