Move content\browser\web_contents to content namespace.

content/browser/web_contents/web_drag_dest_win.cc

Index: content/browser/web_contents/web_drag_dest_win.cc
===================================================================
--- content/browser/web_contents/web_drag_dest_win.cc	(revision 164670)
+++ content/browser/web_contents/web_drag_dest_win.cc	(working copy)
@@ -26,10 +26,8 @@
 using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
 using WebKit::WebDragOperationGeneric;
-using content::OpenURLParams;
-using content::Referrer;
-using content::WebContents;
 
+namespace content {
 namespace {
 
 const unsigned short kHighBitMaskShort = 0x8000;
@@ -93,7 +91,7 @@
     ui::ClipboardUtil::GetUrl(data_object, &url, &title, true);
     OpenURLParams params(

[tfarina, 2012/10/29 19:37:19]

OpenURLParams params(GURL(url), Referrer(), CURRENT_TAB,
                     PAGE_TRANSITION_AUTO_BOOKMARK, false);
                     ^ you can align like this now.

[jam, 2012/10/29 20:01:51]

Done.

         GURL(url), Referrer(), CURRENT_TAB,
-        content::PAGE_TRANSITION_AUTO_BOOKMARK, false);
+        PAGE_TRANSITION_AUTO_BOOKMARK, false);
     web_contents_->OpenURL(params);
     return GetPreferredDropEffect(effect);
   }
@@ -147,7 +145,7 @@
   web_contents_->GetRenderViewHost()->DragTargetDragEnter(*drop_data_,
       gfx::Point(client_pt.x, client_pt.y),
       gfx::Point(cursor_position.x, cursor_position.y),
-      web_drag_utils_win::WinDragOpMaskToWebDragOpMask(effects),
+      WinDragOpMaskToWebDragOpMask(effects),
       GetModifierFlags());
 
   if (delegate_)
@@ -155,7 +153,7 @@
 
   // We lie here and always return a DROPEFFECT because we don't want to
   // wait for the IPC call to return.
-  return web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
+  return WebDragOpToWinDragOp(drag_cursor_);
 }
 
 DWORD WebDragDest::OnDragOver(IDataObject* data_object,
@@ -174,13 +172,13 @@
   web_contents_->GetRenderViewHost()->DragTargetDragOver(
       gfx::Point(client_pt.x, client_pt.y),
       gfx::Point(cursor_position.x, cursor_position.y),
-      web_drag_utils_win::WinDragOpMaskToWebDragOpMask(effects),
+      WinDragOpMaskToWebDragOpMask(effects),
       GetModifierFlags());
 
   if (delegate_)
     delegate_->OnDragOver(data_object);
 
-  return web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
+  return WebDragOpToWinDragOp(drag_cursor_);
 }
 
 void WebDragDest::OnDragLeave(IDataObject* data_object) {
@@ -228,10 +226,12 @@
 
   // This isn't always correct, but at least it's a close approximation.
   // For now, we always map a move to a copy to prevent potential data loss.
-  DWORD drop_effect = web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
+  DWORD drop_effect = WebDragOpToWinDragOp(drag_cursor_);
   DWORD result = drop_effect != DROPEFFECT_MOVE ?
       drop_effect : DROPEFFECT_COPY;

[tfarina, 2012/10/29 19:37:19]

this does fits above.

[jam, 2012/10/29 20:01:51]

Done.

 
   drop_data_.reset();
   return result;
 }
+
+}  // namespace content