Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / global_menu_bar_x11.h

diff --git a/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h b/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h
index a9f266d..45cb42e 100644 (file)
--- a/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h
+++ b/src/chrome/browser/ui/views/frame/global_menu_bar_x11.h
@@ -58,7 +58,7 @@ class GlobalMenuBarX11 : public AvatarMenuObserver,
  public:
   GlobalMenuBarX11(BrowserView* browser_view,
                    BrowserDesktopWindowTreeHostX11* host);
-  virtual ~GlobalMenuBarX11();
+  ~GlobalMenuBarX11() override;
 
   // Creates the object path for DbusemenuServer which is attached to |xid|.
   static std::string GetPathForWindow(unsigned long xid);
@@ -122,26 +122,26 @@ class GlobalMenuBarX11 : public AvatarMenuObserver,
   static void DeleteHistoryItem(void* void_item);
 
   // Overridden from AvatarMenuObserver:
-  virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) OVERRIDE;
+  void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override;
 
   // Overridden from chrome::BrowserListObserver:
-  virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
+  void OnBrowserSetLastActive(Browser* browser) override;
 
   // Overridden from CommandObserver:
-  virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
+  void EnabledStateChangedForCommand(int id, bool enabled) override;
 
   // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  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;
+  void TabRestoreServiceChanged(TabRestoreService* service) override;
+  void TabRestoreServiceDestroyed(TabRestoreService* service) override;
 
   // Overridden from views::DesktopWindowTreeHostObserverX11:
-  virtual void OnWindowMapped(unsigned long xid) OVERRIDE;
-  virtual void OnWindowUnmapped(unsigned long xid) OVERRIDE;
+  void OnWindowMapped(unsigned long xid) override;
+  void OnWindowUnmapped(unsigned long xid) override;
 
   CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnItemActivated, DbusmenuMenuitem*,
                      unsigned int);