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

Side by Side Diff: chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

Issue 8897006: GTK: Remove deprecated methods and replace them with the new standard calls. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Oh, that's what the conflict was. Remove double gtk/gtk.h Created 9 years 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/gtk/nine_box.cc ('k') | chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/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/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/ui/gtk/menu_gtk.h" 9 #include "chrome/browser/ui/gtk/menu_gtk.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 21 matching lines...) Expand all
32 gtk_status_icon_set_from_pixbuf(icon_, pixbuf); 32 gtk_status_icon_set_from_pixbuf(icon_, pixbuf);
33 g_object_unref(pixbuf); 33 g_object_unref(pixbuf);
34 } 34 }
35 35
36 void StatusIconGtk::SetPressedImage(const SkBitmap& image) { 36 void StatusIconGtk::SetPressedImage(const SkBitmap& image) {
37 // Ignore pressed images, since the standard on Linux is to not highlight 37 // Ignore pressed images, since the standard on Linux is to not highlight
38 // pressed status icons. 38 // pressed status icons.
39 } 39 }
40 40
41 void StatusIconGtk::SetToolTip(const string16& tool_tip) { 41 void StatusIconGtk::SetToolTip(const string16& tool_tip) {
42 gtk_status_icon_set_tooltip(icon_, UTF16ToUTF8(tool_tip).c_str()); 42 gtk_status_icon_set_tooltip_text(icon_, UTF16ToUTF8(tool_tip).c_str());
43 } 43 }
44 44
45 void StatusIconGtk::DisplayBalloon(const SkBitmap& icon, 45 void StatusIconGtk::DisplayBalloon(const SkBitmap& icon,
46 const string16& title, 46 const string16& title,
47 const string16& contents) { 47 const string16& contents) {
48 notification_.DisplayBalloon(icon, title, contents); 48 notification_.DisplayBalloon(icon, title, contents);
49 } 49 }
50 50
51 void StatusIconGtk::OnClick(GtkWidget* widget) { 51 void StatusIconGtk::OnClick(GtkWidget* widget) {
52 DispatchClickEvent(); 52 DispatchClickEvent();
53 } 53 }
54 54
55 void StatusIconGtk::UpdatePlatformContextMenu(ui::MenuModel* model) { 55 void StatusIconGtk::UpdatePlatformContextMenu(ui::MenuModel* model) {
56 if (!model) 56 if (!model)
57 menu_.reset(); 57 menu_.reset();
58 else 58 else
59 menu_.reset(new MenuGtk(NULL, model)); 59 menu_.reset(new MenuGtk(NULL, model));
60 } 60 }
61 61
62 void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) { 62 void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) {
63 // If we have a menu - display it. 63 // If we have a menu - display it.
64 if (menu_.get()) 64 if (menu_.get())
65 menu_->PopupAsContextForStatusIcon(time, button, icon_); 65 menu_->PopupAsContextForStatusIcon(time, button, icon_);
66 } 66 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/nine_box.cc ('k') | chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698