diff options
Diffstat (limited to 'chrome/browser/ui/libgtk2ui')
-rw-r--r-- | chrome/browser/ui/libgtk2ui/app_indicator_icon.h | 10 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/gtk2_border.cc | 5 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/gtk2_border.h | 10 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/gtk2_status_icon.h | 10 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/gtk2_ui.h | 76 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/native_theme_gtk2.h | 24 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h | 18 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h | 4 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc | 25 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc | 23 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h | 11 |
11 files changed, 105 insertions, 111 deletions
diff --git a/chrome/browser/ui/libgtk2ui/app_indicator_icon.h b/chrome/browser/ui/libgtk2ui/app_indicator_icon.h index 54a9557..0ceaab7 100644 --- a/chrome/browser/ui/libgtk2ui/app_indicator_icon.h +++ b/chrome/browser/ui/libgtk2ui/app_indicator_icon.h @@ -33,16 +33,16 @@ class AppIndicatorIcon : public views::StatusIconLinux { AppIndicatorIcon(std::string id, const gfx::ImageSkia& image, const base::string16& tool_tip); - virtual ~AppIndicatorIcon(); + ~AppIndicatorIcon() override; // Indicates whether libappindicator so could be opened. static bool CouldOpen(); // Overridden from views::StatusIconLinux: - virtual void SetImage(const gfx::ImageSkia& image) override; - virtual void SetToolTip(const base::string16& tool_tip) override; - virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override; - virtual void RefreshPlatformContextMenu() override; + void SetImage(const gfx::ImageSkia& image) override; + void SetToolTip(const base::string16& tool_tip) override; + void UpdatePlatformContextMenu(ui::MenuModel* menu) override; + void RefreshPlatformContextMenu() override; private: void SetImageFromFile(const base::FilePath& icon_file_path); diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc index ac9d088..daa2c88 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc @@ -44,10 +44,9 @@ class ButtonImageSkiaSource : public gfx::ImageSkiaSource { size_(size) { } - virtual ~ButtonImageSkiaSource() { - } + ~ButtonImageSkiaSource() override {} - virtual gfx::ImageSkiaRep GetImageForScale(float scale) override { + gfx::ImageSkiaRep GetImageForScale(float scale) override { int w = size_.width() * scale; int h = size_.height() * scale; return gfx::ImageSkiaRep( diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.h b/chrome/browser/ui/libgtk2ui/gtk2_border.h index 6217b92..fba75e1 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_border.h +++ b/chrome/browser/ui/libgtk2ui/gtk2_border.h @@ -30,15 +30,15 @@ class Gtk2Border : public views::Border, public ui::NativeThemeObserver { Gtk2Border(Gtk2UI* gtk2_ui, views::LabelButton* owning_button, scoped_ptr<views::LabelButtonBorder> border); - virtual ~Gtk2Border(); + ~Gtk2Border() override; // Overridden from views::Border: - virtual void Paint(const views::View& view, gfx::Canvas* canvas) override; - virtual gfx::Insets GetInsets() const override; - virtual gfx::Size GetMinimumSize() const override; + void Paint(const views::View& view, gfx::Canvas* canvas) override; + gfx::Insets GetInsets() const override; + gfx::Size GetMinimumSize() const override; // Overridden from views::NativeThemeChangeObserver: - virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override; + void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override; private: void PaintState(const ui::NativeTheme::State state, diff --git a/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h b/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h index 2401977..89934a7 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h +++ b/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h @@ -30,13 +30,13 @@ class AppIndicatorIconMenu; class Gtk2StatusIcon : public views::StatusIconLinux { public: Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip); - virtual ~Gtk2StatusIcon(); + ~Gtk2StatusIcon() override; // Overridden from views::StatusIconLinux: - virtual void SetImage(const gfx::ImageSkia& image) override; - virtual void SetToolTip(const base::string16& tool_tip) override; - virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override; - virtual void RefreshPlatformContextMenu() override; + void SetImage(const gfx::ImageSkia& image) override; + void SetToolTip(const base::string16& tool_tip) override; + void UpdatePlatformContextMenu(ui::MenuModel* menu) override; + void RefreshPlatformContextMenu() override; private: CHROMEG_CALLBACK_0(Gtk2StatusIcon, void, OnClick, GtkStatusIcon*); diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h index f982065..a2620f5 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h +++ b/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( + 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::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( + 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( + void AddWindowButtonOrderObserver( views::WindowButtonOrderObserver* observer) override; - virtual void RemoveWindowButtonOrderObserver( + void RemoveWindowButtonOrderObserver( views::WindowButtonOrderObserver* observer) override; - virtual bool UnityIsRunning() override; - virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() override; - virtual void NotifyWindowManagerStartupComplete() 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; diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h index 5dc3bda..78e9c89 100644 --- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h +++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h @@ -22,20 +22,20 @@ class NativeThemeGtk2 : public ui::NativeThemeBase { static NativeThemeGtk2* instance(); // Overridden from ui::NativeThemeBase: - virtual gfx::Size GetPartSize(Part part, - State state, - const ExtraParams& extra) const override; - virtual void Paint(SkCanvas* canvas, - Part part, - State state, - const gfx::Rect& rect, - const ExtraParams& extra) const override; - virtual SkColor GetSystemColor(ColorId color_id) const override; - virtual void PaintMenuPopupBackground( + gfx::Size GetPartSize(Part part, + State state, + const ExtraParams& extra) const override; + void Paint(SkCanvas* canvas, + Part part, + State state, + const gfx::Rect& rect, + const ExtraParams& extra) const override; + SkColor GetSystemColor(ColorId color_id) const override; + void PaintMenuPopupBackground( SkCanvas* canvas, const gfx::Size& size, const MenuBackgroundExtraParams& menu_background) const override; - virtual void PaintMenuItemBackground( + void PaintMenuItemBackground( SkCanvas* canvas, State state, const gfx::Rect& rect, @@ -43,7 +43,7 @@ class NativeThemeGtk2 : public ui::NativeThemeBase { private: NativeThemeGtk2(); - virtual ~NativeThemeGtk2(); + ~NativeThemeGtk2() override; // Implementation of GetSystemColor. GdkColor GetSystemGdkColor(ColorId color_id) const; diff --git a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h index b1b4f51..ce39b5a 100644 --- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h +++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h @@ -37,16 +37,16 @@ class PrintDialogGtk2 PrintingContextLinux* context); // printing::PrintDialogGtkInterface implementation. - virtual void UseDefaultSettings() override; - virtual bool UpdateSettings(printing::PrintSettings* settings) override; - virtual void ShowDialog( + void UseDefaultSettings() override; + bool UpdateSettings(printing::PrintSettings* settings) override; + void ShowDialog( gfx::NativeView parent_view, bool has_selection, const PrintingContextLinux::PrintSettingsCallback& callback) override; - virtual void PrintDocument(const printing::MetafilePlayer& metafile, - const base::string16& document_name) override; - virtual void AddRefToDialog() override; - virtual void ReleaseDialog() override; + void PrintDocument(const printing::MetafilePlayer& metafile, + const base::string16& document_name) override; + void AddRefToDialog() override; + void ReleaseDialog() override; private: friend struct content::BrowserThread::DeleteOnThread< @@ -54,7 +54,7 @@ class PrintDialogGtk2 friend class base::DeleteHelper<PrintDialogGtk2>; explicit PrintDialogGtk2(PrintingContextLinux* context); - virtual ~PrintDialogGtk2(); + ~PrintDialogGtk2() override; // Handles dialog response. CHROMEGTK_CALLBACK_1(PrintDialogGtk2, void, OnResponse, int); @@ -73,7 +73,7 @@ class PrintDialogGtk2 void InitPrintSettings(printing::PrintSettings* settings); // aura::WindowObserver implementation. - virtual void OnWindowDestroying(aura::Window* window) override; + void OnWindowDestroying(aura::Window* window) override; // Printing dialog callback. PrintingContextLinux::PrintSettingsCallback callback_; diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h index dd1bdc9..801bfee 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h @@ -39,12 +39,12 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { static bool CheckKDEDialogWorksOnUIThread(); // BaseShellDialog implementation. - virtual void ListenerDestroyed() override; + void ListenerDestroyed() override; protected: explicit SelectFileDialogImpl(Listener* listener, ui::SelectFilePolicy* policy); - virtual ~SelectFileDialogImpl(); + ~SelectFileDialogImpl() override; // SelectFileDialog implementation. // |params| is user data we pass back via the Listener interface. diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc index 7f0bf79..7a9d112 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc @@ -53,28 +53,27 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl, ui::SelectFilePolicy* policy); protected: - virtual ~SelectFileDialogImplGTK(); + ~SelectFileDialogImplGTK() override; // BaseShellDialog implementation: - virtual bool IsRunning(gfx::NativeWindow parent_window) const override; + bool IsRunning(gfx::NativeWindow parent_window) const override; // SelectFileDialog implementation. // |params| is user data we pass back via the Listener interface. - virtual void SelectFileImpl( - Type type, - const base::string16& title, - const base::FilePath& default_path, - const FileTypeInfo* file_types, - int file_type_index, - const base::FilePath::StringType& default_extension, - gfx::NativeWindow owning_window, - void* params) override; + void SelectFileImpl(Type type, + const base::string16& title, + const base::FilePath& default_path, + const FileTypeInfo* file_types, + int file_type_index, + const base::FilePath::StringType& default_extension, + gfx::NativeWindow owning_window, + void* params) override; private: - virtual bool HasMultipleFileTypeChoicesImpl() override; + bool HasMultipleFileTypeChoicesImpl() override; // Overridden from aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) override; + void OnWindowDestroying(aura::Window* window) override; // Add the filters from |file_types_| to |chooser|. void AddFilters(GtkFileChooser* chooser); diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc index ac6e91a..6a83451 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc @@ -51,25 +51,24 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl { base::nix::DesktopEnvironment desktop); protected: - virtual ~SelectFileDialogImplKDE(); + ~SelectFileDialogImplKDE() override; // BaseShellDialog implementation: - virtual bool IsRunning(gfx::NativeWindow parent_window) const override; + bool IsRunning(gfx::NativeWindow parent_window) const override; // SelectFileDialog implementation. // |params| is user data we pass back via the Listener interface. - virtual void SelectFileImpl( - Type type, - const base::string16& title, - const base::FilePath& default_path, - const FileTypeInfo* file_types, - int file_type_index, - const base::FilePath::StringType& default_extension, - gfx::NativeWindow owning_window, - void* params) override; + void SelectFileImpl(Type type, + const base::string16& title, + const base::FilePath& default_path, + const FileTypeInfo* file_types, + int file_type_index, + const base::FilePath::StringType& default_extension, + gfx::NativeWindow owning_window, + void* params) override; private: - virtual bool HasMultipleFileTypeChoicesImpl() override; + bool HasMultipleFileTypeChoicesImpl() override; struct KDialogParams { KDialogParams(const std::string& type, const std::string& title, diff --git a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h index f64b66a..8f23056 100644 --- a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h +++ b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h @@ -28,14 +28,13 @@ class X11InputMethodContextImplGtk2 : public ui::LinuxInputMethodContext { public: explicit X11InputMethodContextImplGtk2( ui::LinuxInputMethodContextDelegate* delegate); - virtual ~X11InputMethodContextImplGtk2(); + ~X11InputMethodContextImplGtk2() override; // Overriden from ui::LinuxInputMethodContext - virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) override; - virtual void Reset() override; - virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type) - override; - virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override; + bool DispatchKeyEvent(const ui::KeyEvent& key_event) override; + void Reset() override; + void OnTextInputTypeChanged(ui::TextInputType text_input_type) override; + void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override; private: // Resets the cache of X modifier keycodes. |