diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index 64c96ba9a5e..1d0c7b96a21 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -28,8 +28,6 @@ #if defined(USE_X11) #include "atom/browser/ui/views/global_menu_bar_x11.h" #include "atom/browser/ui/views/linux_frame_view.h" -#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" -#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #endif namespace atom { @@ -74,15 +72,6 @@ NativeWindowViews::NativeWindowViews(content::WebContents* web_contents, params.top_level = true; params.remove_standard_frame = true; -#if defined(USE_X11) - // Expose DesktopWindowTreeHostX11 for GlobalMenuBarX11. - params.native_widget = new views::DesktopNativeWidgetAura(window_.get()); - host_ = new views::DesktopWindowTreeHostX11( - window_.get(), - static_cast(params.native_widget)); - params.desktop_window_tree_host = host_; -#endif - bool skip_taskbar = false; if (options.Get(switches::kSkipTaskbar, &skip_taskbar) && skip_taskbar) params.type = views::Widget::InitParams::TYPE_BUBBLE; diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h index 545cd2ede60..5e2094036e2 100644 --- a/atom/browser/native_window_views.h +++ b/atom/browser/native_window_views.h @@ -15,7 +15,6 @@ #include "ui/views/widget/widget_observer.h" namespace views { -class DesktopWindowTreeHostX11; class UnhandledKeyboardEventHandler; class Widget; } @@ -75,10 +74,6 @@ class NativeWindowViews : public NativeWindow, SkRegion* draggable_region() const { return draggable_region_.get(); } views::Widget* widget() const { return window_.get(); } -#if defined(USE_X11) - views::DesktopWindowTreeHostX11* host() const { return host_; } -#endif - private: // NativeWindow: virtual void UpdateDraggableRegions( @@ -122,7 +117,6 @@ class NativeWindowViews : public NativeWindow, views::View* web_view_; // Managed by inspectable_web_contents_. #if defined(USE_X11) - views::DesktopWindowTreeHostX11* host_; // Managed by native_widget. scoped_ptr global_menu_bar_; #endif