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

Unified Diff: views/window/window_gtk.cc

Issue 6881107: Rework the way Widget::Init works: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/widget_win_unittest.cc ('k') | views/window/window_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/window_gtk.cc
===================================================================
--- views/window/window_gtk.cc (revision 83020)
+++ views/window/window_gtk.cc (working copy)
@@ -408,8 +408,7 @@
// WindowGtk, protected:
WindowGtk::WindowGtk(WindowDelegate* window_delegate)
- : WidgetGtk(TYPE_WINDOW),
- Window(window_delegate),
+ : Window(window_delegate),
ALLOW_THIS_IN_INITIALIZER_LIST(delegate_(this)),
window_state_(GDK_WINDOW_STATE_WITHDRAWN),
window_closed_(false) {
@@ -420,7 +419,10 @@
void WindowGtk::InitWindow(GtkWindow* parent, const gfx::Rect& bounds) {
if (parent)
make_transient_to_parent();
- WidgetGtk::Init(GTK_WIDGET(parent), bounds);
+ Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+ params.parent = GTK_WIDGET(parent);
+ params.bounds = bounds;
+ GetWidget()->Init(params);
delegate_->OnNativeWindowCreated(bounds);
g_signal_connect(G_OBJECT(GetNativeWindow()), "configure-event",
« no previous file with comments | « views/widget/widget_win_unittest.cc ('k') | views/window/window_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698