| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" | 5 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" |
| 6 | 6 |
| 7 //////////////////////////////////////////////////////////////////////////////// | 7 //////////////////////////////////////////////////////////////////////////////// |
| 8 // BrowserDesktopWindowTreeHostX11, public: | 8 // BrowserDesktopWindowTreeHostX11, public: |
| 9 | 9 |
| 10 BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11( | 10 BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11( |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 bool BrowserDesktopWindowTreeHostX11::UsesNativeSystemMenu() const { | 35 bool BrowserDesktopWindowTreeHostX11::UsesNativeSystemMenu() const { |
| 36 return false; | 36 return false; |
| 37 } | 37 } |
| 38 | 38 |
| 39 //////////////////////////////////////////////////////////////////////////////// | 39 //////////////////////////////////////////////////////////////////////////////// |
| 40 // BrowserDesktopWindowTreeHostX11, | 40 // BrowserDesktopWindowTreeHostX11, |
| 41 // views::DesktopWindowTreeHostX11 implementation: | 41 // views::DesktopWindowTreeHostX11 implementation: |
| 42 | 42 |
| 43 void BrowserDesktopWindowTreeHostX11::Init( | 43 void BrowserDesktopWindowTreeHostX11::Init( |
| 44 aura::Window* content_window, | 44 aura::Window* content_window, |
| 45 const views::Widget::InitParams& params) { | 45 const views::Widget::InitParams& params, |
| 46 views::DesktopWindowTreeHostX11::Init(content_window, params); | 46 ui::ContextFactory* context_factory) { |
| 47 views::DesktopWindowTreeHostX11::Init(content_window, params, |
| 48 context_factory); |
| 47 | 49 |
| 48 // We have now created our backing X11 window. We now need to (possibly) | 50 // We have now created our backing X11 window. We now need to (possibly) |
| 49 // alert Unity that there's a menu bar attached to it. | 51 // alert Unity that there's a menu bar attached to it. |
| 50 global_menu_bar_x11_.reset(new GlobalMenuBarX11(browser_view_, this)); | 52 global_menu_bar_x11_.reset(new GlobalMenuBarX11(browser_view_, this)); |
| 51 } | 53 } |
| 52 | 54 |
| 53 void BrowserDesktopWindowTreeHostX11::CloseNow() { | 55 void BrowserDesktopWindowTreeHostX11::CloseNow() { |
| 54 global_menu_bar_x11_.reset(); | 56 global_menu_bar_x11_.reset(); |
| 55 DesktopWindowTreeHostX11::CloseNow(); | 57 DesktopWindowTreeHostX11::CloseNow(); |
| 56 } | 58 } |
| 57 | 59 |
| 58 //////////////////////////////////////////////////////////////////////////////// | 60 //////////////////////////////////////////////////////////////////////////////// |
| 59 // BrowserDesktopWindowTreeHost, public: | 61 // BrowserDesktopWindowTreeHost, public: |
| 60 | 62 |
| 61 // static | 63 // static |
| 62 BrowserDesktopWindowTreeHost* | 64 BrowserDesktopWindowTreeHost* |
| 63 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( | 65 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 64 views::internal::NativeWidgetDelegate* native_widget_delegate, | 66 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 65 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 67 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 66 BrowserView* browser_view, | 68 BrowserView* browser_view, |
| 67 BrowserFrame* browser_frame) { | 69 BrowserFrame* browser_frame) { |
| 68 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, | 70 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, |
| 69 desktop_native_widget_aura, | 71 desktop_native_widget_aura, |
| 70 browser_view); | 72 browser_view); |
| 71 } | 73 } |
| OLD | NEW |