| 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
|
| deleted file mode 100644
|
| index ca074477a1aa0a24972239adb63468e9d6b64890..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc
|
| +++ /dev/null
|
| @@ -1,68 +0,0 @@
|
| -// Copyright (c) 2012 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/gtk/status_icons/status_icon_gtk.h"
|
| -
|
| -#include "base/strings/string16.h"
|
| -#include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/ui/gtk/menu_gtk.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| -#include "ui/gfx/gtk_util.h"
|
| -#include "ui/gfx/image/image_skia.h"
|
| -
|
| -StatusIconGtk::StatusIconGtk() {
|
| - icon_ = gtk_status_icon_new();
|
| - gtk_status_icon_set_visible(icon_, TRUE);
|
| -
|
| - g_signal_connect(icon_, "activate",
|
| - G_CALLBACK(OnClickThunk), this);
|
| - g_signal_connect(icon_, "popup-menu",
|
| - G_CALLBACK(OnPopupMenuThunk), this);
|
| -}
|
| -
|
| -StatusIconGtk::~StatusIconGtk() {
|
| - gtk_status_icon_set_visible(icon_, FALSE);
|
| - g_object_unref(icon_);
|
| -}
|
| -
|
| -void StatusIconGtk::SetImage(const gfx::ImageSkia& image) {
|
| - if (image.isNull())
|
| - return;
|
| -
|
| - GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(*image.bitmap());
|
| - gtk_status_icon_set_from_pixbuf(icon_, pixbuf);
|
| - g_object_unref(pixbuf);
|
| -}
|
| -
|
| -void StatusIconGtk::SetPressedImage(const gfx::ImageSkia& image) {
|
| - // Ignore pressed images, since the standard on Linux is to not highlight
|
| - // pressed status icons.
|
| -}
|
| -
|
| -void StatusIconGtk::SetToolTip(const base::string16& tool_tip) {
|
| - gtk_status_icon_set_tooltip_text(icon_, base::UTF16ToUTF8(tool_tip).c_str());
|
| -}
|
| -
|
| -void StatusIconGtk::DisplayBalloon(const gfx::ImageSkia& icon,
|
| - const base::string16& title,
|
| - const base::string16& contents) {
|
| - notification_.DisplayBalloon(icon, title, contents);
|
| -}
|
| -
|
| -void StatusIconGtk::OnClick(GtkWidget* widget) {
|
| - DispatchClickEvent();
|
| -}
|
| -
|
| -void StatusIconGtk::UpdatePlatformContextMenu(StatusIconMenuModel* model) {
|
| - if (!model)
|
| - menu_.reset();
|
| - else
|
| - menu_.reset(new MenuGtk(NULL, model));
|
| -}
|
| -
|
| -void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) {
|
| - // If we have a menu - display it.
|
| - if (menu_.get())
|
| - menu_->PopupAsContextForStatusIcon(time, button, icon_);
|
| -}
|
|
|