chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc - Issue 8351004: Add an extra argument to the DisplayBalloon method to support custom notification icons.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/status_icons/status_icon_gtk.h ('k') | chrome/browser/ui/gtk/status_icons/status_tray_gtk.h » ('j') | chrome/browser/ui/views/status_icons/status_icon_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

diff --git a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

index c9456e837f4b0c043b9cd0518e1ed1dbd5d30042..53b16425a78789ab6eda756a47ecc174e466159d 100644

--- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

+++ b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

@@ -5,7 +5,6 @@

#include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h"

#include "base/string16.h"

-#include "base/logging.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/ui/gtk/menu_gtk.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -43,7 +42,8 @@ void StatusIconGtk::SetToolTip(const string16& tool_tip) {

gtk_status_icon_set_tooltip(icon_, UTF16ToUTF8(tool_tip).c_str());

}

-void StatusIconGtk::DisplayBalloon(const string16& title,

+void StatusIconGtk::DisplayBalloon(const SkBitmap& icon,

+ const string16& title,

const string16& contents) {

// TODO(atwilson): Figure out the right thing to do here.

// http://crbug.com/74970