summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 12:34:20 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 12:34:20 +0000
commitab561612e608909b339ba9f3edbde0629634899c (patch)
treec4974c404cc36d5f978923b1439a9c8d7754bb8e /views/window
parent35274d7b93678c501029ef47d4e07330cac90012 (diff)
downloadchromium_src-ab561612e608909b339ba9f3edbde0629634899c.zip
chromium_src-ab561612e608909b339ba9f3edbde0629634899c.tar.gz
chromium_src-ab561612e608909b339ba9f3edbde0629634899c.tar.bz2
Allow widgets to have keyboard shortcuts.
BUG=cros:3956 TEST=Check that keyboard shortcuts work on login screens. Review URL: http://codereview.chromium.org/2857004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/window_gtk.cc13
-rw-r--r--views/window/window_gtk.h6
2 files changed, 0 insertions, 19 deletions
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 16d3148..f5ffab9 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -373,17 +373,6 @@ void WindowGtk::SetInitialFocus() {
}
}
-// static
-WindowGtk* WindowGtk::GetWindowForNative(GtkWidget* widget) {
- gpointer user_data = g_object_get_data(G_OBJECT(widget), "chrome-window");
- return static_cast<WindowGtk*>(user_data);
-}
-
-// static
-void WindowGtk::SetWindowForNative(GtkWidget* widget, WindowGtk* window) {
- g_object_set_data(G_OBJECT(widget), "chrome-window", window);
-}
-
////////////////////////////////////////////////////////////////////////////////
// WindowGtk, protected:
@@ -423,8 +412,6 @@ void WindowGtk::Init(GtkWindow* parent, const gfx::Rect& bounds) {
UpdateWindowTitle();
SetInitialBounds(parent, bounds);
- SetWindowForNative(GTK_WIDGET(GetNativeWindow()), this);
-
// if (!IsAppWindow()) {
// notification_registrar_.Add(
// this,
diff --git a/views/window/window_gtk.h b/views/window/window_gtk.h
index 358116e..5aa8cbe 100644
--- a/views/window/window_gtk.h
+++ b/views/window/window_gtk.h
@@ -70,12 +70,6 @@ class WindowGtk : public WidgetGtk, public Window {
virtual gboolean OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event);
virtual void SetInitialFocus();
- // Gets the WindowGtk in the userdata section of the widget.
- static WindowGtk* GetWindowForNative(GtkWidget* widget);
-
- // Sets the WindowGtk in the userdata section of the widget.
- static void SetWindowForNative(GtkWidget* widget, WindowGtk* window);
-
protected:
// For the constructor.
friend class Window;