Rename WindowDragDropDelegate->DragDropDelegate

chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

 // 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 "chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h"
 
 #include "base/event_types.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
+#include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "webkit/glue/webdropdata.h"
 
@@ skipping 140 matching lines @@
 
 RenderWidgetHostView* NativeTabContentsViewAura::CreateRenderWidgetHostView(
     RenderWidgetHost* render_widget_host) {
   RenderWidgetHostViewAura* view =
       new RenderWidgetHostViewAura(render_widget_host);
   view->InitAsChild();
   GetNativeView()->AddChild(view->GetNativeView());
   view->Show();
 
   // We listen to drag drop events in the newly created view's window.
-  aura::Window* window = static_cast<aura::Window*>(view->GetNativeView());
-  DCHECK(window);
-  window->SetProperty(aura::kDragDropDelegateKey,
-      static_cast<aura::WindowDragDropDelegate*>(this));
+  aura::client::SetDragDropDelegate(view->GetNativeView(), this);
   return view;
 }
 
 gfx::NativeWindow NativeTabContentsViewAura::GetTopLevelNativeWindow() const {
   // TODO(beng):
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void NativeTabContentsViewAura::SetPageTitle(const string16& title) {
   GetNativeView()->set_title(title);
 }
 
 void NativeTabContentsViewAura::StartDragging(const WebDropData& drop_data,
                                              WebKit::WebDragOperationsMask ops,
                                              const SkBitmap& image,
                                              const gfx::Point& image_offset) {
-  aura::DragDropClient* client = static_cast<aura::DragDropClient*>(
-      aura::RootWindow::GetInstance()->GetProperty(
-          aura::kRootWindowDragDropClientKey));
-  if (!client)
+  if (!aura::client::GetDragDropClient())
     return;
 
   ui::OSExchangeDataProviderAura* provider = new ui::OSExchangeDataProviderAura;
   PrepareDragData(drop_data, provider);
   if (!image.isNull())
     provider->set_drag_image(image);
   ui::OSExchangeData data(provider);  // takes ownership of |provider|.
 
   scoped_ptr<WebDragSourceAura> drag_source(new WebDragSourceAura(this));
 
   // We need to enable recursive tasks on the message loop so we can get
   // updates while in the system DoDragDrop loop.
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
-  int result_op = client->StartDragAndDrop(data, ConvertFromWeb(ops));
+  int result_op = aura::client::GetDragDropClient()->StartDragAndDrop(
+      data, ConvertFromWeb(ops));
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 
   EndDrag(ConvertToWeb(result_op));
   GetTabContents()->render_view_host()->DragSourceSystemDragEnded();
 }
 
 void NativeTabContentsViewAura::CancelDrag() {
-  aura::DragDropClient* client = static_cast<aura::DragDropClient*>(
-      aura::RootWindow::GetInstance()->GetProperty(
-          aura::kRootWindowDragDropClientKey));
-  if (client)
-    client->DragCancel();
+  if (aura::client::GetDragDropClient())
+    aura::client::GetDragDropClient()->DragCancel();
 }
 
 bool NativeTabContentsViewAura::IsDoingDrag() const {
-  aura::DragDropClient* client = static_cast<aura::DragDropClient*>(
-      aura::RootWindow::GetInstance()->GetProperty(
-          aura::kRootWindowDragDropClientKey));
-  if (client)
-    return client->IsDragDropInProgress();
+  if (aura::client::GetDragDropClient())
+    return aura::client::GetDragDropClient()->IsDragDropInProgress();
   return false;
 }
 
 void NativeTabContentsViewAura::SetDragCursor(
     WebKit::WebDragOperation operation) {
   current_drag_op_ = operation;
 }
 
 views::NativeWidget* NativeTabContentsViewAura::AsNativeWidget() {
   return this;
@@ skipping 73 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsView, public:
 
 // static
 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView(
     internal::NativeTabContentsViewDelegate* delegate) {
   return new NativeTabContentsViewAura(delegate);
 }