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

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reupload to try off of ToT instead of LKGR Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_
7 7
8 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 8 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
9 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" 9 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"
10 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h" 10 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
11 11
12 class BrowserFrame; 12 class BrowserFrame;
13 class BrowserView; 13 class BrowserView;
14 14
15 namespace views { 15 namespace views {
16 class DesktopNativeWidgetAura; 16 class DesktopNativeWidgetAura;
17 } 17 }
18 18
19 class BrowserDesktopWindowTreeHostX11 19 class BrowserDesktopWindowTreeHostX11
20 : public BrowserDesktopWindowTreeHost, 20 : public BrowserDesktopWindowTreeHost,
21 public views::DesktopWindowTreeHostX11 { 21 public views::DesktopWindowTreeHostX11 {
22 public: 22 public:
23 BrowserDesktopWindowTreeHostX11( 23 BrowserDesktopWindowTreeHostX11(
24 views::internal::NativeWidgetDelegate* native_widget_delegate, 24 views::internal::NativeWidgetDelegate* native_widget_delegate,
25 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 25 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
26 BrowserView* browser_view); 26 BrowserView* browser_view,
27 BrowserFrame* browser_frame);
27 virtual ~BrowserDesktopWindowTreeHostX11(); 28 virtual ~BrowserDesktopWindowTreeHostX11();
28 29
29 private: 30 private:
30 // Overridden from BrowserDesktopWindowTreeHost: 31 // Overridden from BrowserDesktopWindowTreeHost:
31 virtual DesktopWindowTreeHost* AsDesktopWindowTreeHost() OVERRIDE; 32 virtual DesktopWindowTreeHost* AsDesktopWindowTreeHost() OVERRIDE;
32 virtual int GetMinimizeButtonOffset() const OVERRIDE; 33 virtual int GetMinimizeButtonOffset() const OVERRIDE;
33 virtual bool UsesNativeSystemMenu() const OVERRIDE; 34 virtual bool UsesNativeSystemMenu() const OVERRIDE;
34 35
35 // Overridden from views::DesktopWindowTreeHostX11: 36 // Overridden from views::DesktopWindowTreeHostX11:
36 virtual void Init( 37 virtual void Init(
37 aura::Window* content_window, 38 aura::Window* content_window,
38 const views::Widget::InitParams& params) OVERRIDE; 39 const views::Widget::InitParams& params) OVERRIDE;
39 virtual void CloseNow() OVERRIDE; 40 virtual void CloseNow() OVERRIDE;
40 41
41 BrowserView* browser_view_; 42 BrowserView* browser_view_;
42 43
43 // Each browser frame maintains its own menu bar object because the lower 44 // Each browser frame maintains its own menu bar object because the lower
44 // level dbus protocol associates a xid to a menu bar; we can't map multiple 45 // level dbus protocol associates a xid to a menu bar; we can't map multiple
45 // xids to the same menu bar. 46 // xids to the same menu bar.
46 scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_; 47 scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_;
47 48
48 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11); 49 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11);
49 }; 50 };
50 51
51 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ 52 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698