Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6430)

Unified Diff: chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h

Issue 160573002: Move root_window_host* in aura to window_tree_host*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h
diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h b/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h
deleted file mode 100644
index 2548797188564b7c9ac9084c7e78a84381ec9fe7..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_
-
-#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
-#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h"
-#include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
-
-class BrowserFrame;
-class BrowserView;
-
-namespace views {
-class DesktopNativeWidgetAura;
-}
-
-class BrowserDesktopWindowTreeHostX11
- : public BrowserDesktopWindowTreeHost,
- public views::DesktopWindowTreeHostX11 {
- public:
- BrowserDesktopWindowTreeHostX11(
- views::internal::NativeWidgetDelegate* native_widget_delegate,
- views::DesktopNativeWidgetAura* desktop_native_widget_aura,
- BrowserView* browser_view);
- virtual ~BrowserDesktopWindowTreeHostX11();
-
- private:
- // Overridden from BrowserDesktopWindowTreeHost:
- virtual DesktopWindowTreeHost* AsDesktopWindowTreeHost() OVERRIDE;
- virtual int GetMinimizeButtonOffset() const OVERRIDE;
- virtual bool UsesNativeSystemMenu() const OVERRIDE;
-
- // Overridden from views::DesktopWindowTreeHostX11:
- virtual void Init(
- aura::Window* content_window,
- const views::Widget::InitParams& params,
- aura::RootWindow::CreateParams* rw_create_params) OVERRIDE;
- virtual void CloseNow() OVERRIDE;
-
- BrowserView* browser_view_;
-
- // Each browser frame maintains its own menu bar object because the lower
- // level dbus protocol associates a xid to a menu bar; we can't map multiple
- // xids to the same menu bar.
- scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11);
-};
-
-#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_

Powered by Google App Engine
This is Rietveld 408576698