Aura/ash split: Don't use X11 window borders.

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/root_window.h"
 #include "ui/aura/desktop/desktop_activation_client.h"
 #include "ui/aura/desktop/desktop_dispatcher_client.h"
 #include "ui/aura/client/dispatcher_client.h"
 #include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/shared/root_window_event_filter.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
 
 namespace views {
 
 DesktopNativeWidgetHelperAura::DesktopNativeWidgetHelperAura(
     NativeWidgetAura* widget)
     : widget_(widget),
       root_window_event_filter_(NULL),
       is_embedded_window_(false) {
 }
 
 DesktopNativeWidgetHelperAura::~DesktopNativeWidgetHelperAura() {
-  if (root_window_event_filter_)
+  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());
+  }
 }
 
 void DesktopNativeWidgetHelperAura::PreInitialize(
     const Widget::InitParams& params) {
   // 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 14 matching lines @@
   root_window_->Init();
 
   root_window_event_filter_ =
       new aura::shared::RootWindowEventFilter(root_window_.get());
   root_window_->SetEventFilter(root_window_event_filter_);
 
   input_method_filter_.reset(
       new aura::shared::InputMethodEventFilter(root_window_.get()));
   root_window_event_filter_->AddFilter(input_method_filter_.get());
 
+#if defined(USE_X11)
+  x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_.get()));
+  x11_window_event_filter_->SetUseHostWindowBorders(false);
+  root_window_event_filter_->AddFilter(x11_window_event_filter_.get());
+#endif
+
   root_window_->AddRootWindowObserver(this);
 
   aura::client::SetActivationClient(
       root_window_.get(),
       new aura::DesktopActivationClient(root_window_.get()));
   aura::client::SetDispatcherClient(root_window_.get(),
                                     new aura::DesktopDispatcherClient);
 }
 
 void DesktopNativeWidgetHelperAura::PostInitialize() {
@@ skipping 58 matching lines @@
                                root->GetHostSize()));
 }
 
 void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed(
     const aura::RootWindow* root) {
   DCHECK_EQ(root, root_window_.get());
   widget_->GetWidget()->Close();
 }
 
 }  // namespace views