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

Side by Side Diff: chrome/browser/ui/gtk/status_icons/status_icon_gtk.h

Issue 8351004: Add an extra argument to the DisplayBalloon method to support custom notification icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing argument order as suggested. Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
11 #include "base/compiler_specific.h"
11 #include "chrome/browser/status_icons/status_icon.h" 12 #include "chrome/browser/status_icons/status_icon.h"
12 #include "ui/base/gtk/gtk_signal.h" 13 #include "ui/base/gtk/gtk_signal.h"
13 14
14 class MenuGtk; 15 class MenuGtk;
15 class SkBitmap; 16 class SkBitmap;
16 17
17 class StatusIconGtk : public StatusIcon { 18 class StatusIconGtk : public StatusIcon {
18 public: 19 public:
19 StatusIconGtk(); 20 StatusIconGtk();
20 virtual ~StatusIconGtk(); 21 virtual ~StatusIconGtk();
21 22
22 // Overridden from StatusIcon: 23 // Overridden from StatusIcon:
23 virtual void SetImage(const SkBitmap& image); 24 virtual void SetImage(const SkBitmap& image) OVERRIDE;
24 virtual void SetPressedImage(const SkBitmap& image); 25 virtual void SetPressedImage(const SkBitmap& image) OVERRIDE;
25 virtual void SetToolTip(const string16& tool_tip); 26 virtual void SetToolTip(const string16& tool_tip) OVERRIDE;
26 virtual void DisplayBalloon(const string16& title, const string16& contents); 27 virtual void DisplayBalloon(const SkBitmap& icon,
28 const string16& title,
29 const string16& contents);
27 30
28 // Exposed for testing. 31 // Exposed for testing.
29 CHROMEGTK_CALLBACK_0(StatusIconGtk, void, OnClick); 32 CHROMEGTK_CALLBACK_0(StatusIconGtk, void, OnClick);
30 33
31 protected: 34 protected:
32 // Overridden from StatusIcon. 35 // Overridden from StatusIcon.
33 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); 36 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu);
34 37
35 private: 38 private:
36 // Callback invoked when user right-clicks on the status icon. 39 // Callback invoked when user right-clicks on the status icon.
37 CHROMEGTK_CALLBACK_2(StatusIconGtk, void, OnPopupMenu, guint, guint); 40 CHROMEGTK_CALLBACK_2(StatusIconGtk, void, OnPopupMenu, guint, guint);
38 41
39 // The currently-displayed icon for the window. 42 // The currently-displayed icon for the window.
40 GtkStatusIcon* icon_; 43 GtkStatusIcon* icon_;
41 44
42 // The context menu for this icon (if any). 45 // The context menu for this icon (if any).
43 scoped_ptr<MenuGtk> menu_; 46 scoped_ptr<MenuGtk> menu_;
44 47
45 DISALLOW_COPY_AND_ASSIGN(StatusIconGtk); 48 DISALLOW_COPY_AND_ASSIGN(StatusIconGtk);
46 }; 49 };
47 50
48 #endif // CHROME_BROWSER_UI_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_ 51 #endif // CHROME_BROWSER_UI_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698