Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_status_icon.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_border.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_
6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_ 6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h" 10 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
(...skipping 15 matching lines...) Expand all
26 class AppIndicatorIconMenu; 26 class AppIndicatorIconMenu;
27 27
28 // Status icon implementation which uses the system tray X11 spec (via 28 // Status icon implementation which uses the system tray X11 spec (via
29 // GtkStatusIcon). 29 // GtkStatusIcon).
30 class Gtk2StatusIcon : public views::StatusIconLinux { 30 class Gtk2StatusIcon : public views::StatusIconLinux {
31 public: 31 public:
32 Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip); 32 Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip);
33 virtual ~Gtk2StatusIcon(); 33 virtual ~Gtk2StatusIcon();
34 34
35 // Overridden from views::StatusIconLinux: 35 // Overridden from views::StatusIconLinux:
36 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE; 36 virtual void SetImage(const gfx::ImageSkia& image) override;
37 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE; 37 virtual void SetToolTip(const base::string16& tool_tip) override;
38 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE; 38 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
39 virtual void RefreshPlatformContextMenu() OVERRIDE; 39 virtual void RefreshPlatformContextMenu() override;
40 40
41 private: 41 private:
42 CHROMEG_CALLBACK_0(Gtk2StatusIcon, void, OnClick, GtkStatusIcon*); 42 CHROMEG_CALLBACK_0(Gtk2StatusIcon, void, OnClick, GtkStatusIcon*);
43 43
44 CHROMEG_CALLBACK_2(Gtk2StatusIcon, 44 CHROMEG_CALLBACK_2(Gtk2StatusIcon,
45 void, 45 void,
46 OnContextMenuRequested, 46 OnContextMenuRequested,
47 GtkStatusIcon*, 47 GtkStatusIcon*,
48 guint, 48 guint,
49 guint); 49 guint);
50 50
51 GtkStatusIcon* gtk_status_icon_; 51 GtkStatusIcon* gtk_status_icon_;
52 52
53 scoped_ptr<AppIndicatorIconMenu> menu_; 53 scoped_ptr<AppIndicatorIconMenu> menu_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(Gtk2StatusIcon); 55 DISALLOW_COPY_AND_ASSIGN(Gtk2StatusIcon);
56 }; 56 };
57 57
58 } // namespace libgtk2ui 58 } // namespace libgtk2ui
59 59
60 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_ 60 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_border.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698