Aura: Build on the linux desktop, plus add USE_ASH.

chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.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 "chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.h"
 
-// TODO(beng): USE_ASH
-#include "ash/shell.h"
-#include "ash/wm/visibility_controller.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/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.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"
 
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#include "ash/wm/visibility_controller.h"
+#endif
+
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 namespace {
 
 // Listens to all mouse drag events during a drag and drop and sends them to
 // the renderer.
 class WebDragSourceAura : public MessageLoopForUI::Observer {
  public:
   explicit WebDragSourceAura(NativeTabContentsViewAura* view)
       : view_(view) {
     MessageLoopForUI::current()->AddObserver(this);
   }
 
   virtual ~WebDragSourceAura() {
     MessageLoopForUI::current()->RemoveObserver(this);
   }
 
   // MessageLoop::Observer implementation:
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE {
     return base::EVENT_CONTINUE;
   }
   virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
+#if defined(USE_ASH)
     ui::EventType type = ui::EventTypeFromNative(event);
     RenderViewHost* rvh = NULL;
     switch (type) {
       case ui::ET_MOUSE_DRAGGED:
         rvh = view_->GetWebContents()->GetRenderViewHost();
         if (rvh) {
           gfx::Point screen_loc = ui::EventLocationFromNative(event);
           gfx::Point client_loc = screen_loc;
           aura::Window* window = rvh->view()->GetNativeView();
           aura::Window::ConvertPointToWindow(ash::Shell::GetRootWindow(),

[Ben Goodger (Google), 2012/02/28 20:12:06]

if you rewrite this slightly, replacing ash::Shell::GetRootWindow() with
window->GetRootWindow(), this whole block will build and run on vanilla Aura.

               window, &client_loc);
           rvh->DragSourceMovedTo(client_loc.x(), client_loc.y(),
               screen_loc.x(), screen_loc.y());
         }
         break;
       default:
         break;
     }
+#else
+    NOTIMPLEMENTED();
+#endif
   }
 
+
  private:
   NativeTabContentsViewAura* view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura);
 };
 
 // Utility to fill a ui::OSExchangeDataProviderAura object from WebDropData.
 void PrepareDragData(const WebDropData& drop_data,
                      ui::OSExchangeDataProviderAura* provider) {
   if (!drop_data.plain_text.empty())
@@ skipping 67 matching lines @@
 
 void NativeTabContentsViewAura::InitNativeTabContentsView() {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.native_widget = this;
   // We don't draw anything so we don't need a texture.
   params.create_texture_for_layer = false;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = NULL;
   params.can_activate = true;
   GetWidget()->Init(params);
+#if defined(USE_ASH)
   ash::SetChildWindowVisibilityChangesAnimated(GetWidget()->GetNativeView());
+#else
+  NOTIMPLEMENTED() << "Need to animate in";
+#endif
 
   // Hide the widget to prevent it from showing up on the root window. This is
   // needed for TabContentses that aren't immediately added to the tabstrip,
   // e.g. the Instant preview contents.
   // TODO(beng): investigate if control-type windows shouldn't be hidden by
   //             default if they are created with no parent. Pending oshima's
   //             change to reflect Widget types onto a ViewProp.
   GetWidget()->Hide();
 }
 
@@ skipping 34 matching lines @@
     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));
 
+#if defined(USE_ASH)

[Ben Goodger (Google), 2012/02/28 20:12:06]

I don't see why this is Ash-specific?

   // We need to enable recursive tasks on the message loop so we can get
   // updates while in the system DoDragDrop loop.
   int result_op = 0;
   {
     // TODO(sad): Avoid using last_mouse_location here, since the drag may not
     // always start from a mouse-event (e.g. a touch or gesture event could
     // initiate the drag). The location information should be carried over from
     // webkit. http://crbug.com/114754
     gfx::Point location(root_window->last_mouse_location());
     location.Offset(-image_offset.x(), -image_offset.y());
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
     result_op = aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
         data, location, ConvertFromWeb(ops));
   }
+  EndDrag(ConvertToWeb(result_op));
+#else
+  NOTIMPLEMENTED() << "Drops without ash aren't implemented.";
+#endif
 
-  EndDrag(ConvertToWeb(result_op));
   GetWebContents()->GetRenderViewHost()->DragSourceSystemDragEnded();
 }
 
 void NativeTabContentsViewAura::CancelDrag() {
   aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
   if (aura::client::GetDragDropClient(root_window))
     aura::client::GetDragDropClient(root_window)->DragCancel();
 }
 
 bool NativeTabContentsViewAura::IsDoingDrag() const {
@@ skipping 36 matching lines @@
     }
   }
   // Pass all mouse event to renderer.
   return views::NativeWidgetAura::OnMouseEvent(event);
 }
 
 void NativeTabContentsViewAura::OnDragEntered(
     const aura::DropTargetEvent& event) {
   WebDropData drop_data;
   PrepareWebDropData(&drop_data, event.data());
+#if defined(USE_ASH)
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
 
   gfx::Point screen_pt = ash::Shell::GetRootWindow()->last_mouse_location();

[Ben Goodger (Google), 2012/02/28 20:12:06]

replace ash::Shell::GetRootWindow() with:

GetNativeView()->GetRootWindow()

and this will build

   GetWebContents()->GetRenderViewHost()->DragTargetDragEnter(
       drop_data, event.location(), screen_pt, op);
+#else
+  NOTIMPLEMENTED();
+#endif
 }
 
 int NativeTabContentsViewAura::OnDragUpdated(
     const aura::DropTargetEvent& event) {
+#if defined(USE_ASH)
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
   gfx::Point screen_pt = ash::Shell::GetRootWindow()->last_mouse_location();

[Ben Goodger (Google), 2012/02/28 20:12:06]

same here

   GetWebContents()->GetRenderViewHost()->DragTargetDragOver(
       event.location(), screen_pt, op);
   return ConvertFromWeb(current_drag_op_);
+#else
+  NOTIMPLEMENTED();
+  return -1;
+#endif
 }
 
 void NativeTabContentsViewAura::OnDragExited() {
   GetWebContents()->GetRenderViewHost()->DragTargetDragLeave();
 }
 
 int NativeTabContentsViewAura::OnPerformDrop(
     const aura::DropTargetEvent& event) {
+#if defined(USE_ASH)
   GetWebContents()->GetRenderViewHost()->DragTargetDrop(
       event.location(), ash::Shell::GetRootWindow()->last_mouse_location());

[Ben Goodger (Google), 2012/02/28 20:12:06]

and here

   return current_drag_op_;
+#else
+  NOTIMPLEMENTED();
+  return -1;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsViewAura, private:
 
 void NativeTabContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) {
+#if defined(USE_ASH)
   gfx::Point screen_loc =
       ash::Shell::GetRootWindow()->last_mouse_location();

[Ben Goodger (Google), 2012/02/28 20:12:06]

and here

   gfx::Point client_loc = screen_loc;
   RenderViewHost* rvh = GetWebContents()->GetRenderViewHost();
   aura::Window* window = rvh->view()->GetNativeView();
   aura::Window::ConvertPointToWindow(ash::Shell::GetRootWindow(),
       window, &client_loc);
   rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(),
       screen_loc.y(), ops);
+#else
+  NOTIMPLEMENTED();
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsView, public:
 
 // static
 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView(
     internal::NativeTabContentsViewDelegate* delegate) {
   return new NativeTabContentsViewAura(delegate);
 }