Move content\browser\web_contents to content namespace.

content/browser/web_contents/web_drag_dest_win.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_drag_dest_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_drag_utils_win.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationCopy;
 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;
 
 // A helper method for getting the preferred drop effect.
 DWORD GetPreferredDropEffect(DWORD effect) {
   if (effect & DROPEFFECT_COPY)
     return DROPEFFECT_COPY;
   if (effect & DROPEFFECT_LINK)
     return DROPEFFECT_LINK;
@@ skipping 41 matching lines @@
   void OnDragLeave(IDataObject* data_object) {
   }
 
   DWORD OnDrop(IDataObject* data_object, DWORD effect) {
     if (!ui::ClipboardUtil::HasUrl(data_object))
       return DROPEFFECT_NONE;
 
     std::wstring url;
     std::wstring title;
     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);
   }
 
  private:
   WebContents* web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialDropTarget);
 };
 
@@ skipping 33 matching lines @@
     ui::OSExchangeDataProviderWin::GetPlainTextURL(data_object,
                                                    &drop_data_->url);
 
   drag_cursor_ = WebDragOperationNone;
 
   POINT client_pt = cursor_position;
   ScreenToClient(GetHWND(), &client_pt);
   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_)
       delegate_->OnDragEnter(data_object);
 
   // 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,
                               DWORD key_state,
                               POINT cursor_position,
                               DWORD effects) {
   DCHECK(current_rvh_);
   if (current_rvh_ != web_contents_->GetRenderViewHost())
     OnDragEnter(data_object, key_state, cursor_position, effects);
 
   if (web_contents_->ShowingInterstitialPage())
     return interstitial_drop_target_->OnDragOver(data_object, effects);
 
   POINT client_pt = cursor_position;
   ScreenToClient(GetHWND(), &client_pt);
   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) {
   DCHECK(current_rvh_);
   if (current_rvh_ != web_contents_->GetRenderViewHost())
     return;
 
   if (web_contents_->ShowingInterstitialPage()) {
     interstitial_drop_target_->OnDragLeave(data_object);
   } else {
@@ skipping 27 matching lines @@
       gfx::Point(cursor_position.x, cursor_position.y),
       GetModifierFlags());
 
   if (delegate_)
     delegate_->OnDrop(data_object);
 
   current_rvh_ = NULL;
 
   // 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