Aura desktop: Fix tab dragging within a single chrome window.

ui/views/widget/desktop_native_widget_helper_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 "ui/views/widget/desktop_native_widget_helper_aura.h"
 
 #include "ui/aura/client/dispatcher_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/cursor_manager.h"
 #include "ui/aura/desktop/desktop_activation_client.h"
 #include "ui/aura/desktop/desktop_dispatcher_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/shared/root_window_capture_client.h"
+#include "ui/aura/window_property.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/hwnd_subclass.h"
 #include "ui/views/widget/widget_message_filter.h"
 #elif defined(USE_X11)
 #include "ui/views/widget/x11_window_event_filter.h"
 #endif
 
+DECLARE_WINDOW_PROPERTY_TYPE(aura::Window*);
+
 namespace views {
 
+DEFINE_WINDOW_PROPERTY_KEY(
+    aura::Window*, kViewsWindowForRootWindow, NULL);
+
 namespace {
 
 // Client that always offsets the passed in point by the RootHost's origin.
 class RootWindowScreenPositionClient
     : public aura::client::ScreenPositionClient {
  public:
   explicit RootWindowScreenPositionClient(aura::RootWindow* root_window)
       : root_window_(root_window) {}
   virtual ~RootWindowScreenPositionClient() {}
 
@@ skipping 40 matching lines @@
 DesktopNativeWidgetHelperAura::~DesktopNativeWidgetHelperAura() {
   if (root_window_event_filter_) {
 #if defined(USE_X11)
     root_window_event_filter_->RemoveFilter(x11_window_event_filter_.get());
 #endif
 
     root_window_event_filter_->RemoveFilter(input_method_filter_.get());
   }
 }
 
+// static
+aura::Window* DesktopNativeWidgetHelperAura::GetViewsWindowForRootWindow(
+    aura::RootWindow* root) {
+  return root ? root->GetProperty(kViewsWindowForRootWindow) : NULL;
+}
+
 void DesktopNativeWidgetHelperAura::PreInitialize(
     aura::Window* window,
     const Widget::InitParams& params) {
 #if !defined(OS_WIN)
   // We don't want the status bubble or the omnibox to get their own root
   // window on the desktop; on Linux
   //
   // TODO(erg): This doesn't map perfectly to what I want to do. TYPE_POPUP is
   // used for lots of stuff, like dragged tabs, and I only want this to trigger
   // for the status bubble and the omnibox.
@@ skipping 10 matching lines @@
   gfx::Rect bounds = params.bounds;
   if (bounds.IsEmpty()) {
     // We must pass some non-zero value when we initialize a RootWindow. This
     // will probably be SetBounds()ed soon.
     bounds.set_size(gfx::Size(100, 100));
   }
   // TODO(erg): Implement aura::CursorManager::Delegate to control
   // cursor's shape and visibility.
 
   root_window_.reset(new aura::RootWindow(bounds));
+  root_window_->SetProperty(kViewsWindowForRootWindow, window);
   root_window_->Init();
   root_window_->set_focus_manager(new aura::FocusManager);
 
   // No event filter for aura::Env. Create CompoundEvnetFilter per RootWindow.
   root_window_event_filter_ = new aura::shared::CompoundEventFilter;
   // Pass ownership of the filter to the root_window.
   root_window_->SetEventFilter(root_window_event_filter_);
 
   input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
   input_method_filter_->SetInputMethodPropertyInRootWindow(root_window_.get());
@@ skipping 72 matching lines @@
                                root->GetHostSize()));
 }
 
 void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed(
     const aura::RootWindow* root) {
   DCHECK_EQ(root, root_window_.get());
   widget_->GetWidget()->Close();
 }
 
 }  // namespace views