summaryrefslogtreecommitdiffstats
path: root/ui/views/widget/widget.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 21:09:46 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 21:09:46 +0000
commit5a9de31f01f29f0a2c754598a7f4c7eea7c3771e (patch)
treeabfc3cdb052e57dc7d3bdfd9cbbb15ac55351dc0 /ui/views/widget/widget.h
parent8c1e91b079517e00fb2d8e58594524e798aa08b6 (diff)
downloadchromium_src-5a9de31f01f29f0a2c754598a7f4c7eea7c3771e.zip
chromium_src-5a9de31f01f29f0a2c754598a7f4c7eea7c3771e.tar.gz
chromium_src-5a9de31f01f29f0a2c754598a7f4c7eea7c3771e.tar.bz2
views cleanup: Merge parent and parent_widget.
According to Ben, parent_widget is a leftover from when we had NativeViewGtk. It isn't needed now and everything should be handleable by the normal parent. BUG=161882 Review URL: https://chromiumcodereview.appspot.com/11299317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget/widget.h')
-rw-r--r--ui/views/widget/widget.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 136ae6f..b8511ff 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -141,9 +141,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
InitParams();
explicit InitParams(Type type);
- // If |parent_widget| is non-null, its native view is returned, otherwise
- // |parent| is returned.
- gfx::NativeView GetParent() const;
// Will return the first of the following that isn't NULL: the native view,
// |parent|, |context|.
@@ -177,7 +174,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// Should the widget be double buffered? Default is false.
bool double_buffer;
gfx::NativeView parent;
- Widget* parent_widget;
// Specifies the initial bounds of the Widget. Default is empty, which means
// the NativeWidget may specify a default size. If the parent is specified,
// |bounds| is in the parent's coordinate system. If the parent is not