| 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_root_window_host_x11.h" | 5 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h" |
| 6 | 6 |
| 7 //////////////////////////////////////////////////////////////////////////////// | 7 //////////////////////////////////////////////////////////////////////////////// |
| 8 // BrowserDesktopRootWindowHostX11, public: | 8 // BrowserDesktopWindowTreeHostX11, public: |
| 9 | 9 |
| 10 BrowserDesktopRootWindowHostX11::BrowserDesktopRootWindowHostX11( | 10 BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11( |
| 11 views::internal::NativeWidgetDelegate* native_widget_delegate, | 11 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 12 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 12 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 13 BrowserView* browser_view) | 13 BrowserView* browser_view) |
| 14 : DesktopRootWindowHostX11(native_widget_delegate, | 14 : DesktopWindowTreeHostX11(native_widget_delegate, |
| 15 desktop_native_widget_aura), | 15 desktop_native_widget_aura), |
| 16 browser_view_(browser_view) { | 16 browser_view_(browser_view) { |
| 17 } | 17 } |
| 18 | 18 |
| 19 BrowserDesktopRootWindowHostX11::~BrowserDesktopRootWindowHostX11() { | 19 BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() { |
| 20 } | 20 } |
| 21 | 21 |
| 22 //////////////////////////////////////////////////////////////////////////////// | 22 //////////////////////////////////////////////////////////////////////////////// |
| 23 // BrowserDesktopRootWindowHostX11, | 23 // BrowserDesktopWindowTreeHostX11, |
| 24 // BrowserDesktopRootWindowHost implementation: | 24 // BrowserDesktopWindowTreeHost implementation: |
| 25 | 25 |
| 26 views::DesktopRootWindowHost* | 26 views::DesktopWindowTreeHost* |
| 27 BrowserDesktopRootWindowHostX11::AsDesktopRootWindowHost() { | 27 BrowserDesktopWindowTreeHostX11::AsDesktopWindowTreeHost() { |
| 28 return this; | 28 return this; |
| 29 } | 29 } |
| 30 | 30 |
| 31 int BrowserDesktopRootWindowHostX11::GetMinimizeButtonOffset() const { | 31 int BrowserDesktopWindowTreeHostX11::GetMinimizeButtonOffset() const { |
| 32 return 0; | 32 return 0; |
| 33 } | 33 } |
| 34 | 34 |
| 35 bool BrowserDesktopRootWindowHostX11::UsesNativeSystemMenu() const { | 35 bool BrowserDesktopWindowTreeHostX11::UsesNativeSystemMenu() const { |
| 36 return false; | 36 return false; |
| 37 } | 37 } |
| 38 | 38 |
| 39 //////////////////////////////////////////////////////////////////////////////// | 39 //////////////////////////////////////////////////////////////////////////////// |
| 40 // BrowserDesktopRootWindowHostX11, | 40 // BrowserDesktopWindowTreeHostX11, |
| 41 // views::DesktopRootWindowHostX11 implementation: | 41 // views::DesktopWindowTreeHostX11 implementation: |
| 42 | 42 |
| 43 void BrowserDesktopRootWindowHostX11::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 aura::RootWindow::CreateParams* rw_create_params) { | 46 aura::RootWindow::CreateParams* rw_create_params) { |
| 47 views::DesktopRootWindowHostX11::Init(content_window, params, | 47 views::DesktopWindowTreeHostX11::Init(content_window, params, |
| 48 rw_create_params); | 48 rw_create_params); |
| 49 | 49 |
| 50 // 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) |
| 51 // alert Unity that there's a menu bar attached to it. | 51 // alert Unity that there's a menu bar attached to it. |
| 52 global_menu_bar_x11_.reset(new GlobalMenuBarX11(browser_view_, this)); | 52 global_menu_bar_x11_.reset(new GlobalMenuBarX11(browser_view_, this)); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void BrowserDesktopRootWindowHostX11::CloseNow() { | 55 void BrowserDesktopWindowTreeHostX11::CloseNow() { |
| 56 global_menu_bar_x11_.reset(); | 56 global_menu_bar_x11_.reset(); |
| 57 DesktopRootWindowHostX11::CloseNow(); | 57 DesktopWindowTreeHostX11::CloseNow(); |
| 58 } | 58 } |
| 59 | 59 |
| 60 //////////////////////////////////////////////////////////////////////////////// | 60 //////////////////////////////////////////////////////////////////////////////// |
| 61 // BrowserDesktopRootWindowHost, public: | 61 // BrowserDesktopWindowTreeHost, public: |
| 62 | 62 |
| 63 // static | 63 // static |
| 64 BrowserDesktopRootWindowHost* | 64 BrowserDesktopWindowTreeHost* |
| 65 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost( | 65 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( |
| 66 views::internal::NativeWidgetDelegate* native_widget_delegate, | 66 views::internal::NativeWidgetDelegate* native_widget_delegate, |
| 67 views::DesktopNativeWidgetAura* desktop_native_widget_aura, | 67 views::DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 68 BrowserView* browser_view, | 68 BrowserView* browser_view, |
| 69 BrowserFrame* browser_frame) { | 69 BrowserFrame* browser_frame) { |
| 70 return new BrowserDesktopRootWindowHostX11(native_widget_delegate, | 70 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, |
| 71 desktop_native_widget_aura, | 71 desktop_native_widget_aura, |
| 72 browser_view); | 72 browser_view); |
| 73 } | 73 } |
| OLD | NEW |