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