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

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 18334003: Linux status icon for Ubuntu Unity (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: file restored Created 7 years, 5 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
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 de66141b103d89ab015a8332eeb59e359c93a6ec..4167edc10f98c36f5d64a8793d31b7851ff7197f 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -12,7 +12,9 @@
#include "base/logging.h"
#include "base/nix/mime_util_xdg.h"
#include "base/stl_util.h"
+#include "base/strings/stringprintf.h"
#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
#include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
#include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
@@ -49,6 +51,12 @@
namespace {
+// Prefix for app indicator ids
+const char kAppIndicatorIdPrefix[] = "chrome_app_indicator_";
+
+// Number of app indicators used (used as part of app-indicator id).
+int indicators_count;
+
// The size of the rendered toolbar image.
const int kToolbarImageWidth = 64;
const int kToolbarImageHeight = 128;
@@ -304,6 +312,8 @@ Gtk2UI::Gtk2UI() {
// style-set signal handler.
LoadGtkValues();
SetXDGIconTheme();
+
+ indicators_count = 0;
}
Gtk2UI::~Gtk2UI() {
@@ -381,6 +391,20 @@ void Gtk2UI::SetProgressFraction(float percentage) const {
unity::SetProgressFraction(percentage);
}
+bool Gtk2UI::IsStatusIconSupported() const {
+ return AppIndicatorIcon::CouldOpen();
+}
+
+scoped_ptr<StatusIconLinux> Gtk2UI::CreateLinuxStatusIcon() const {
+ if (AppIndicatorIcon::CouldOpen()) {
+ ++indicators_count;
+ return scoped_ptr<StatusIconLinux>(new AppIndicatorIcon(
+ base::StringPrintf("%s%d", kAppIndicatorIdPrefix, indicators_count)));
+ } else {
+ return scoped_ptr<StatusIconLinux>();
+ }
+}
+
ui::SelectFileDialog* Gtk2UI::CreateSelectFileDialog(
ui::SelectFileDialog::Listener* listener,
ui::SelectFilePolicy* policy) const {

Powered by Google App Engine
This is Rietveld 408576698