| Index: chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
|
| index c5e52ce1560a490eec78205258a9651f1d9a1a2f..2ff9be141e5504d8b9d3377c9b93f7f391d3d21f 100644
|
| --- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
|
| @@ -5,46 +5,46 @@
|
| #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h"
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// BrowserDesktopRootWindowHostX11, public:
|
| +// BrowserDesktopWindowTreeHostX11, public:
|
|
|
| -BrowserDesktopRootWindowHostX11::BrowserDesktopRootWindowHostX11(
|
| +BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11(
|
| views::internal::NativeWidgetDelegate* native_widget_delegate,
|
| views::DesktopNativeWidgetAura* desktop_native_widget_aura,
|
| BrowserView* browser_view)
|
| - : DesktopRootWindowHostX11(native_widget_delegate,
|
| + : DesktopWindowTreeHostX11(native_widget_delegate,
|
| desktop_native_widget_aura),
|
| browser_view_(browser_view) {
|
| }
|
|
|
| -BrowserDesktopRootWindowHostX11::~BrowserDesktopRootWindowHostX11() {
|
| +BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() {
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// BrowserDesktopRootWindowHostX11,
|
| -// BrowserDesktopRootWindowHost implementation:
|
| +// BrowserDesktopWindowTreeHostX11,
|
| +// BrowserDesktopWindowTreeHost implementation:
|
|
|
| -views::DesktopRootWindowHost*
|
| - BrowserDesktopRootWindowHostX11::AsDesktopRootWindowHost() {
|
| +views::DesktopWindowTreeHost*
|
| + BrowserDesktopWindowTreeHostX11::AsDesktopWindowTreeHost() {
|
| return this;
|
| }
|
|
|
| -int BrowserDesktopRootWindowHostX11::GetMinimizeButtonOffset() const {
|
| +int BrowserDesktopWindowTreeHostX11::GetMinimizeButtonOffset() const {
|
| return 0;
|
| }
|
|
|
| -bool BrowserDesktopRootWindowHostX11::UsesNativeSystemMenu() const {
|
| +bool BrowserDesktopWindowTreeHostX11::UsesNativeSystemMenu() const {
|
| return false;
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// BrowserDesktopRootWindowHostX11,
|
| -// views::DesktopRootWindowHostX11 implementation:
|
| +// BrowserDesktopWindowTreeHostX11,
|
| +// views::DesktopWindowTreeHostX11 implementation:
|
|
|
| -void BrowserDesktopRootWindowHostX11::Init(
|
| +void BrowserDesktopWindowTreeHostX11::Init(
|
| aura::Window* content_window,
|
| const views::Widget::InitParams& params,
|
| aura::RootWindow::CreateParams* rw_create_params) {
|
| - views::DesktopRootWindowHostX11::Init(content_window, params,
|
| + views::DesktopWindowTreeHostX11::Init(content_window, params,
|
| rw_create_params);
|
|
|
| // We have now created our backing X11 window. We now need to (possibly)
|
| @@ -52,22 +52,22 @@ void BrowserDesktopRootWindowHostX11::Init(
|
| global_menu_bar_x11_.reset(new GlobalMenuBarX11(browser_view_, this));
|
| }
|
|
|
| -void BrowserDesktopRootWindowHostX11::CloseNow() {
|
| +void BrowserDesktopWindowTreeHostX11::CloseNow() {
|
| global_menu_bar_x11_.reset();
|
| - DesktopRootWindowHostX11::CloseNow();
|
| + DesktopWindowTreeHostX11::CloseNow();
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// BrowserDesktopRootWindowHost, public:
|
| +// BrowserDesktopWindowTreeHost, public:
|
|
|
| // static
|
| -BrowserDesktopRootWindowHost*
|
| - BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost(
|
| +BrowserDesktopWindowTreeHost*
|
| + BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
|
| views::internal::NativeWidgetDelegate* native_widget_delegate,
|
| views::DesktopNativeWidgetAura* desktop_native_widget_aura,
|
| BrowserView* browser_view,
|
| BrowserFrame* browser_frame) {
|
| - return new BrowserDesktopRootWindowHostX11(native_widget_delegate,
|
| + return new BrowserDesktopWindowTreeHostX11(native_widget_delegate,
|
| desktop_native_widget_aura,
|
| browser_view);
|
| }
|
|
|