summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/native_menu_gtk.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 14:43:12 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 14:43:12 +0000
commit2fc6672f21decd142da98665de2a0330b2e0ac57 (patch)
tree52246ce158462b88cd4cc8cad667eb28a039e2b3 /views/controls/menu/native_menu_gtk.cc
parente8491289e4313d396ea9e1522209c1305d60a227 (diff)
downloadchromium_src-2fc6672f21decd142da98665de2a0330b2e0ac57.zip
chromium_src-2fc6672f21decd142da98665de2a0330b2e0ac57.tar.gz
chromium_src-2fc6672f21decd142da98665de2a0330b2e0ac57.tar.bz2
Rename WidgetWin/Gtk -> NativeWidgetWin/Gtk.
BUG=72040 TEST=none TBR=sky Review URL: http://codereview.chromium.org/7039050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/native_menu_gtk.cc')
-rw-r--r--views/controls/menu/native_menu_gtk.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index b04d3bc9..b9db871 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -22,7 +22,7 @@
#include "views/controls/menu/menu_2.h"
#include "views/controls/menu/nested_dispatcher_gtk.h"
#include "views/views_delegate.h"
-#include "views/widget/widget_gtk.h"
+#include "views/widget/native_widget_gtk.h"
namespace {
@@ -108,8 +108,8 @@ void NativeMenuGtk::RunMenuAt(const gfx::Point& point, int alignment) {
// the menu after the menu painted itself.
GtkWidget* popup_window = gtk_widget_get_ancestor(menu_, GTK_TYPE_WINDOW);
CHECK(popup_window);
- WidgetGtk::UpdateFreezeUpdatesProperty(GTK_WINDOW(popup_window),
- true /* add */);
+ NativeWidgetGtk::UpdateFreezeUpdatesProperty(GTK_WINDOW(popup_window),
+ true /* add */);
expose_handler_id_ = g_signal_connect_after(G_OBJECT(menu_), "expose_event",
G_CALLBACK(&OnExposeThunk), this);
@@ -346,8 +346,8 @@ gboolean NativeMenuGtk::OnExpose(GtkWidget* widget, GdkEventExpose* event) {
GtkWidget* popup_window = gtk_widget_get_ancestor(menu_, GTK_TYPE_WINDOW);
CHECK(popup_window);
DCHECK(expose_handler_id_);
- WidgetGtk::UpdateFreezeUpdatesProperty(GTK_WINDOW(popup_window),
- false /* remove */);
+ NativeWidgetGtk::UpdateFreezeUpdatesProperty(GTK_WINDOW(popup_window),
+ false /* remove */);
if (expose_handler_id_) {
g_signal_handler_disconnect(menu_, expose_handler_id_);
expose_handler_id_ = 0;