Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

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

 // Copyright 2013 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_GLOBAL_MENU_BAR_X11_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
 
 #include <map>
 #include <string>
 
@@ skipping 17 matching lines @@
 }
 
 namespace ui {
 class Accelerator;
 }
 
 class Browser;
 class BrowserView;
 class Profile;
 
-class BrowserDesktopWindowTreeHostX11;
+class BrowserDesktopRootWindowHostX11;
 struct GlobalMenuBarCommand;
 
 // Controls the Mac style menu bar on Unity.
 //
 // Unity has an Apple-like menu bar at the top of the screen that changes
 // depending on the active window. In the GTK port, we had a hidden GtkMenuBar
 // object in each GtkWindow which existed only to be scrapped by the
 // libdbusmenu-gtk code. Since we don't have GtkWindows anymore, we need to
 // interface directly with the lower level libdbusmenu-glib, which we
 // opportunistically dlopen() since not everyone is running Ubuntu.
 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|.
   static std::string GetPathForWindow(unsigned long xid);
 
  private:
   struct HistoryItem;
   typedef std::map<int, DbusmenuMenuitem*> CommandIDMenuItemMap;
 
   // Builds a separator.
@@ skipping 53 matching lines @@
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from TabRestoreServiceObserver:
   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;
 
   CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnItemActivated, DbusmenuMenuitem*,
                      unsigned int);
   CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnHistoryItemActivated,
                      DbusmenuMenuitem*, unsigned int);
   CHROMEG_CALLBACK_0(GlobalMenuBarX11, void, OnHistoryMenuAboutToShow,
                      DbusmenuMenuitem*);
 
   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.
   CommandIDMenuItemMap id_to_menu_item_;
 
   DbusmenuServer* server_;
   DbusmenuMenuitem* root_item_;
   DbusmenuMenuitem* history_menu_;
 
   // Tracks value of the kShowBookmarkBar preference.
   PrefChangeRegistrar pref_change_registrar_;
 
   history::TopSites* top_sites_;
 
   TabRestoreService* tab_restore_service_;  // weak
 
   content::NotificationRegistrar registrar_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_