trunk/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h - Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h

Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 1 month 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

« no previous file with comments | « trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc ('k') | trunk/src/chrome/browser/ui/views/frame/global_menu_bar_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h

===================================================================

--- trunk/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h (revision 236090)

+++ trunk/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h (working copy)

@@ -35,7 +35,7 @@

class BrowserView;

class Profile;

-class BrowserDesktopWindowTreeHostX11;

+class BrowserDesktopRootWindowHostX11;

struct GlobalMenuBarCommand;

// Controls the Mac style menu bar on Unity.

@@ -49,10 +49,10 @@

class GlobalMenuBarX11 : public CommandObserver,

public content::NotificationObserver,

public TabRestoreServiceObserver,

- public views::DesktopWindowTreeHostObserverX11 {

+ public views::DesktopRootWindowHostObserverX11 {

public:

GlobalMenuBarX11(BrowserView* browser_view,

- BrowserDesktopWindowTreeHostX11* host);

+ BrowserDesktopRootWindowHostX11* host);

virtual ~GlobalMenuBarX11();

// Creates the object path for DbusemenuServer which is attached to |xid|.

@@ -126,7 +126,7 @@

virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;

virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;

- // Overridden from views::DesktopWindowTreeHostObserverX11:

+ // Overridden from views::DesktopRootWindowHostObserverX11:

virtual void OnWindowMapped(unsigned long xid) OVERRIDE;

virtual void OnWindowUnmapped(unsigned long xid) OVERRIDE;

@@ -140,7 +140,7 @@

Browser* browser_;

Profile* profile_;

BrowserView* browser_view_;

- BrowserDesktopWindowTreeHostX11* host_;

+ BrowserDesktopRootWindowHostX11* host_;

// Maps command ids to DbusmenuMenuitems so we can modify their

// enabled/checked state in response to state change notifications.