| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/gtk/status_icons/status_icon_gtk.h" | 5 #include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" |
| 6 | 6 |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/gtk/menu_gtk.h" | 10 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 11 #include "gfx/gtk_util.h" | 11 #include "gfx/gtk_util.h" |
| 12 #include "third_party/skia/include/core/SkBitmap.h" | 12 #include "third_party/skia/include/core/SkBitmap.h" |
| 13 | 13 |
| 14 StatusIconGtk::StatusIconGtk() { | 14 StatusIconGtk::StatusIconGtk() { |
| 15 icon_ = gtk_status_icon_new(); | 15 icon_ = gtk_status_icon_new(); |
| 16 gtk_status_icon_set_visible(icon_, TRUE); | 16 gtk_status_icon_set_visible(icon_, TRUE); |
| 17 | 17 |
| 18 g_signal_connect(icon_, "activate", | 18 g_signal_connect(icon_, "activate", |
| 19 G_CALLBACK(OnClickThunk), this); | 19 G_CALLBACK(OnClickThunk), this); |
| 20 g_signal_connect(icon_, "popup-menu", | 20 g_signal_connect(icon_, "popup-menu", |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 menu_.reset(); | 52 menu_.reset(); |
| 53 else | 53 else |
| 54 menu_.reset(new MenuGtk(NULL, model)); | 54 menu_.reset(new MenuGtk(NULL, model)); |
| 55 } | 55 } |
| 56 | 56 |
| 57 void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) { | 57 void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) { |
| 58 // If we have a menu - display it. | 58 // If we have a menu - display it. |
| 59 if (menu_.get()) | 59 if (menu_.get()) |
| 60 menu_->PopupAsContextForStatusIcon(time, button, icon_); | 60 menu_->PopupAsContextForStatusIcon(time, button, icon_); |
| 61 } | 61 } |
| OLD | NEW |