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

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

Issue 291893009: 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
Index: chrome/browser/ui/libgtk2ui/app_indicator_icon_fallback.cc
diff --git a/chrome/browser/ui/libgtk2ui/app_indicator_icon_fallback.cc b/chrome/browser/ui/libgtk2ui/app_indicator_icon_fallback.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7448e5ac634ebe4073f5fad7488427aa2f4ac603
--- /dev/null
+++ b/chrome/browser/ui/libgtk2ui/app_indicator_icon_fallback.cc
@@ -0,0 +1,83 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/libgtk2ui/app_indicator_icon_fallback.h"
+
+#include <gtk/gtk.h>
+
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/libgtk2ui/app_indicator_icon_menu.h"
+#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
+#include "ui/base/models/menu_model.h"
+#include "ui/gfx/image/image_skia.h"
+
+namespace libgtk2ui {
+
+AppIndicatorIconFallback::AppIndicatorIconFallback(
+ const gfx::ImageSkia& image,
+ const base::string16& tool_tip) {
+ GdkPixbuf* pixbuf = GdkPixbufFromSkBitmap(*image.bitmap());
+ gtk_status_icon_ = gtk_status_icon_new_from_pixbuf(pixbuf);
+ g_object_unref(pixbuf);
+
+ g_signal_connect(gtk_status_icon_, "activate", G_CALLBACK(OnClickThunk),
+ this);
+ g_signal_connect(gtk_status_icon_, "popup_menu",
+ G_CALLBACK(OnContextMenuRequestedThunk), this);
+ SetToolTip(tool_tip);
+}
+
+AppIndicatorIconFallback::~AppIndicatorIconFallback() {
+ g_object_unref(gtk_status_icon_);
+}
+
+void AppIndicatorIconFallback::SetImage(const gfx::ImageSkia& image) {
+ GdkPixbuf* pixbuf = GdkPixbufFromSkBitmap(*image.bitmap());
+ gtk_status_icon_set_from_pixbuf(gtk_status_icon_, pixbuf);
+ g_object_unref(pixbuf);
+}
+
+void AppIndicatorIconFallback::SetPressedImage(const gfx::ImageSkia& image) {
+ // Ignore pressed images, since the standard on Linux is to not highlight
+ // pressed status icons.
+}
+
+void AppIndicatorIconFallback::SetToolTip(const base::string16& tool_tip) {
+ gtk_status_icon_set_tooltip_text(gtk_status_icon_,
+ base::UTF16ToUTF8(tool_tip).c_str());
+}
+
+void AppIndicatorIconFallback::UpdatePlatformContextMenu(ui::MenuModel* model) {
+ menu_.reset();
+ if (model)
+ menu_.reset(new AppIndicatorIconMenu(model));
+}
+
+void AppIndicatorIconFallback::RefreshPlatformContextMenu() {
+ if (menu_.get())
+ menu_->Refresh();
+}
+
+void AppIndicatorIconFallback::OnClick(
+ GtkStatusIcon* status_icon) {
+ if (delegate())
+ delegate()->OnClick();
Elliot Glaysher 2014/05/27 23:25:51 To make sure I understand this, this fires when th
pkotwicz 2014/05/27 23:50:12 Yes, that's correct
+}
+
+void AppIndicatorIconFallback::OnContextMenuRequested(
+ GtkStatusIcon* status_icon,
+ guint button,
+ guint32 activate_time) {
+ if (menu_.get()) {
+ gtk_menu_popup(menu_->GetGtkMenu(),
+ NULL,
+ NULL,
+ gtk_status_icon_position_menu,
+ gtk_status_icon_,
+ button,
+ activate_time);
+ }
+}
+
+} // namespace libgtk2ui

Powered by Google App Engine
This is Rietveld 408576698