diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 02:38:23 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 02:38:23 +0000 |
| commit | e0d13d42c9428d2da55fe5b2f32c146441de9e8b (patch) | |
| tree | f43d9e027633e9ba3104cc1986404943b69475a4 /views | |
| parent | 51a84914077b3ebcf0a957f14d166fedf57919d3 (diff) | |
| download | chromium_src-e0d13d42c9428d2da55fe5b2f32c146441de9e8b.zip chromium_src-e0d13d42c9428d2da55fe5b2f32c146441de9e8b.tar.gz chromium_src-e0d13d42c9428d2da55fe5b2f32c146441de9e8b.tar.bz2 | |
NativeWidgetPrivate::CreateNativeWidget should check for NULL on views_delegate
as views_delegate may not be initialized when touchui is set
BUG=none.
TEST=none.
Review URL: http://codereview.chromium.org/7529031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/native_widget_gtk.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index 572c53a..b24412c 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -2144,7 +2144,7 @@ namespace internal { // static NativeWidgetPrivate* NativeWidgetPrivate::CreateNativeWidget( NativeWidgetDelegate* delegate) { - if (Widget::IsPureViews() && + if (Widget::IsPureViews() && ViewsDelegate::views_delegate && ViewsDelegate::views_delegate->GetDefaultParentView()) { return new NativeWidgetViews(delegate); } |