| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h" | 5 #include "chrome/browser/ui/libgtkui/gtk2_status_icon.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/ui/libgtk2ui/app_indicator_icon_menu.h" | 10 #include "chrome/browser/ui/libgtkui/app_indicator_icon_menu.h" |
| 11 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" | 11 #include "chrome/browser/ui/libgtkui/skia_utils_gtk2.h" |
| 12 #include "ui/base/models/menu_model.h" | 12 #include "ui/base/models/menu_model.h" |
| 13 #include "ui/gfx/image/image_skia.h" | 13 #include "ui/gfx/image/image_skia.h" |
| 14 | 14 |
| 15 G_GNUC_BEGIN_IGNORE_DEPRECATIONS | 15 G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
| 16 | 16 |
| 17 namespace libgtk2ui { | 17 namespace libgtkui { |
| 18 | 18 |
| 19 Gtk2StatusIcon::Gtk2StatusIcon(const gfx::ImageSkia& image, | 19 Gtk2StatusIcon::Gtk2StatusIcon(const gfx::ImageSkia& image, |
| 20 const base::string16& tool_tip) { | 20 const base::string16& tool_tip) { |
| 21 GdkPixbuf* pixbuf = GdkPixbufFromSkBitmap(*image.bitmap()); | 21 GdkPixbuf* pixbuf = GdkPixbufFromSkBitmap(*image.bitmap()); |
| 22 gtk_status_icon_ = gtk_status_icon_new_from_pixbuf(pixbuf); | 22 gtk_status_icon_ = gtk_status_icon_new_from_pixbuf(pixbuf); |
| 23 g_object_unref(pixbuf); | 23 g_object_unref(pixbuf); |
| 24 | 24 |
| 25 g_signal_connect(gtk_status_icon_, "activate", G_CALLBACK(OnClickThunk), | 25 g_signal_connect(gtk_status_icon_, "activate", G_CALLBACK(OnClickThunk), |
| 26 this); | 26 this); |
| 27 g_signal_connect(gtk_status_icon_, "popup_menu", | 27 g_signal_connect(gtk_status_icon_, "popup_menu", |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 gtk_menu_popup(menu_->GetGtkMenu(), | 68 gtk_menu_popup(menu_->GetGtkMenu(), |
| 69 NULL, | 69 NULL, |
| 70 NULL, | 70 NULL, |
| 71 gtk_status_icon_position_menu, | 71 gtk_status_icon_position_menu, |
| 72 gtk_status_icon_, | 72 gtk_status_icon_, |
| 73 button, | 73 button, |
| 74 activate_time); | 74 activate_time); |
| 75 } | 75 } |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace libgtk2ui | 78 } // namespace libgtkui |
| OLD | NEW |