chrome/browser/ui/libgtk2ui/gtk2_ui.cc - Issue 306063003: Reland: Fall back to X11 system tray icons if libappindicator is not available.

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/libgtk2ui/gtk2_ui.cc

Issue 306063003: Reland: Fall back to X11 system tray icons if libappindicator is not available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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

« chrome/browser/ui/libgtk2ui/app_indicator_icon_menu.cc ('K') | « chrome/browser/ui/libgtk2ui/gtk2_status_icon.cc ('k') | chrome/browser/ui/libgtk2ui/libgtk2ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

index bb92ddae9cc074a1836ce9ce8d7e2f05ee8113d1..eace24d2c78206ccf73ee86f66117b8b7a0f374c 100644

--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/ui/libgtk2ui/gtk2_event_loop.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_key_bindings_handler.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_signal_registrar.h"

+#include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"

#include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"

#include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h"

@@ -504,7 +505,7 @@ void Gtk2UI::SetProgressFraction(float percentage) const {

}

bool Gtk2UI::IsStatusIconSupported() const {

- return AppIndicatorIcon::CouldOpen();

+ return true;

}

scoped_ptr<views::StatusIconLinux> Gtk2UI::CreateLinuxStatusIcon(

@@ -517,7 +518,8 @@ scoped_ptr<views::StatusIconLinux> Gtk2UI::CreateLinuxStatusIcon(

image,

tool_tip));

} else {

- return scoped_ptr<views::StatusIconLinux>();

+ return scoped_ptr<views::StatusIconLinux>(new Gtk2StatusIcon(

+ image, tool_tip));

}