diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:07:04 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:07:04 +0000 |
| commit | f8dce00e633d5ffde45e008fb8f51d5a76942f6b (patch) | |
| tree | 7e7174b73f30eb981924f6bba5d581ed5ccaa41a /views/widget | |
| parent | 4db49098666ed9200af30bbd471c7faed40312af (diff) | |
| download | chromium_src-f8dce00e633d5ffde45e008fb8f51d5a76942f6b.zip chromium_src-f8dce00e633d5ffde45e008fb8f51d5a76942f6b.tar.gz chromium_src-f8dce00e633d5ffde45e008fb8f51d5a76942f6b.tar.bz2 | |
Landing oshima patch.
Disable NOTREACHED assertion for Linux. A view in WidgetGtk with TYPE_CHILD crashes
at this assertion. A bug http://crbug.com/21335 is filed to keep track of this.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/195056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/root_view.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index 9d11c27..8baca07 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -512,8 +512,13 @@ void RootView::ProcessMouseDragCanceled() { void RootView::FocusView(View* view) { if (view != GetFocusedView()) { FocusManager* focus_manager = GetFocusManager(); + // TODO(jcampan): This fails under WidgetGtk with TYPE_CHILD. + // (see http://crbug.com/21335) Reenable DCHECK and + // verify GetFocusManager works as expecte. +#if defined(OS_WIN) DCHECK(focus_manager) << "No Focus Manager for Window " << (GetWidget() ? GetWidget()->GetNativeView() : 0); +#endif if (!focus_manager) return; focus_manager->SetFocusedView(view); |