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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
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/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/ui/gtk/menu_gtk.h" 10 #include "chrome/browser/ui/gtk/menu_gtk.h"
11 #include "gfx/gtk_util.h"
12 #include "third_party/skia/include/core/SkBitmap.h" 11 #include "third_party/skia/include/core/SkBitmap.h"
12 #include "ui/gfx/gtk_util.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",
21 G_CALLBACK(OnPopupMenuThunk), this); 21 G_CALLBACK(OnPopupMenuThunk), this);
22 } 22 }
(...skipping 29 matching lines...) Expand all
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/status_bubble_gtk.h ('k') | chrome/browser/ui/gtk/tab_contents_container_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698