Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / libgtk2ui / gtk2_ui.h

diff --git a/src/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/src/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index 2a16c73..a2620f5 100644 (file)
--- a/src/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/src/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -44,7 +44,7 @@ class GConfListener;
 class Gtk2UI : public views::LinuxUI {
  public:
   Gtk2UI();
-  virtual ~Gtk2UI();
+  ~Gtk2UI() override;
 
   typedef base::Callback<ui::NativeTheme*(aura::Window* window)>
       NativeThemeGetter;
@@ -63,61 +63,59 @@ class Gtk2UI : public views::LinuxUI {
                                int height) const;
 
   // ui::LinuxInputMethodContextFactory:
-  virtual scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
-      ui::LinuxInputMethodContextDelegate* delegate) const OVERRIDE;
+  scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
+      ui::LinuxInputMethodContextDelegate* delegate) const override;
 
   // gfx::LinuxFontDelegate:
-  virtual gfx::FontRenderParams GetDefaultFontRenderParams() const OVERRIDE;
-  virtual scoped_ptr<gfx::ScopedPangoFontDescription>
-      GetDefaultPangoFontDescription() const OVERRIDE;
-  virtual double GetFontDPI() const OVERRIDE;
+  gfx::FontRenderParams GetDefaultFontRenderParams() const override;
+  scoped_ptr<gfx::ScopedPangoFontDescription> GetDefaultPangoFontDescription()
+      const override;
+  double GetFontDPI() const override;
 
   // ui::LinuxShellDialog:
-  virtual ui::SelectFileDialog* CreateSelectFileDialog(
+  ui::SelectFileDialog* CreateSelectFileDialog(
       ui::SelectFileDialog::Listener* listener,
-      ui::SelectFilePolicy* policy) const OVERRIDE;
+      ui::SelectFilePolicy* policy) const override;
 
   // ui::LinuxUI:
-  virtual void Initialize() OVERRIDE;
-  virtual gfx::Image GetThemeImageNamed(int id) const OVERRIDE;
-  virtual bool GetColor(int id, SkColor* color) const OVERRIDE;
-  virtual bool HasCustomImage(int id) const OVERRIDE;
-  virtual SkColor GetFocusRingColor() const OVERRIDE;
-  virtual SkColor GetThumbActiveColor() const OVERRIDE;
-  virtual SkColor GetThumbInactiveColor() const OVERRIDE;
-  virtual SkColor GetTrackColor() const OVERRIDE;
-  virtual SkColor GetActiveSelectionBgColor() const OVERRIDE;
-  virtual SkColor GetActiveSelectionFgColor() const OVERRIDE;
-  virtual SkColor GetInactiveSelectionBgColor() const OVERRIDE;
-  virtual SkColor GetInactiveSelectionFgColor() const OVERRIDE;
-  virtual double GetCursorBlinkInterval() const OVERRIDE;
-  virtual ui::NativeTheme* GetNativeTheme(aura::Window* window) const OVERRIDE;
-  virtual void SetNativeThemeOverride(const NativeThemeGetter& callback)
-      OVERRIDE;
-  virtual bool GetDefaultUsesSystemTheme() const OVERRIDE;
-  virtual void SetDownloadCount(int count) const OVERRIDE;
-  virtual void SetProgressFraction(float percentage) const OVERRIDE;
-  virtual bool IsStatusIconSupported() const OVERRIDE;
-  virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
+  void Initialize() override;
+  gfx::Image GetThemeImageNamed(int id) const override;
+  bool GetColor(int id, SkColor* color) const override;
+  bool HasCustomImage(int id) const override;
+  SkColor GetFocusRingColor() const override;
+  SkColor GetThumbActiveColor() const override;
+  SkColor GetThumbInactiveColor() const override;
+  SkColor GetTrackColor() const override;
+  SkColor GetActiveSelectionBgColor() const override;
+  SkColor GetActiveSelectionFgColor() const override;
+  SkColor GetInactiveSelectionBgColor() const override;
+  SkColor GetInactiveSelectionFgColor() const override;
+  double GetCursorBlinkInterval() const override;
+  ui::NativeTheme* GetNativeTheme(aura::Window* window) const override;
+  void SetNativeThemeOverride(const NativeThemeGetter& callback) override;
+  bool GetDefaultUsesSystemTheme() const override;
+  void SetDownloadCount(int count) const override;
+  void SetProgressFraction(float percentage) const override;
+  bool IsStatusIconSupported() const override;
+  scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
       const gfx::ImageSkia& image,
-      const base::string16& tool_tip) const OVERRIDE;
-  virtual gfx::Image GetIconForContentType(
-      const std::string& content_type, int size) const OVERRIDE;
-  virtual scoped_ptr<views::Border> CreateNativeBorder(
+      const base::string16& tool_tip) const override;
+  gfx::Image GetIconForContentType(const std::string& content_type,
+                                   int size) const override;
+  scoped_ptr<views::Border> CreateNativeBorder(
       views::LabelButton* owning_button,
-      scoped_ptr<views::LabelButtonBorder> border) OVERRIDE;
-  virtual void AddWindowButtonOrderObserver(
-      views::WindowButtonOrderObserver* observer) OVERRIDE;
-  virtual void RemoveWindowButtonOrderObserver(
-      views::WindowButtonOrderObserver* observer) OVERRIDE;
-  virtual bool UnityIsRunning() OVERRIDE;
-  virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() OVERRIDE;
-  virtual void NotifyWindowManagerStartupComplete() OVERRIDE;
+      scoped_ptr<views::LabelButtonBorder> border) override;
+  void AddWindowButtonOrderObserver(
+      views::WindowButtonOrderObserver* observer) override;
+  void RemoveWindowButtonOrderObserver(
+      views::WindowButtonOrderObserver* observer) override;
+  bool UnityIsRunning() override;
+  NonClientMiddleClickAction GetNonClientMiddleClickAction() override;
+  void NotifyWindowManagerStartupComplete() override;
 
   // ui::TextEditKeybindingDelegate:
-  virtual bool MatchEvent(
-      const ui::Event& event,
-      std::vector<ui::TextEditCommandAuraLinux>* commands) OVERRIDE;
+  bool MatchEvent(const ui::Event& event,
+                  std::vector<ui::TextEditCommandAuraLinux>* commands) override;
 
  private:
   typedef std::map<int, SkColor> ColorMap;