diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 01:08:30 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 01:08:30 +0000 |
| commit | a3f773fb59bc3f148c627bb616f61b72b98f40b9 (patch) | |
| tree | f0e05afe055a82956a3a99981669bfc5d55407b5 | |
| parent | 360bb1b9e8ee500115aede472f16db3f32f6393f (diff) | |
| download | chromium_src-a3f773fb59bc3f148c627bb616f61b72b98f40b9.zip chromium_src-a3f773fb59bc3f148c627bb616f61b72b98f40b9.tar.gz chromium_src-a3f773fb59bc3f148c627bb616f61b72b98f40b9.tar.bz2 | |
Revert 132284 - Fix build bustage by correcting ifdef
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10082037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132305 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/views/controls/webview/webview.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index 4234a8c..4de68b5 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -62,8 +62,11 @@ void WebView::SetFastResize(bool fast_resize) { void WebView::OnWebContentsFocused(content::WebContents* web_contents) { DCHECK(web_contents == web_contents_); FocusManager* focus_manager = GetFocusManager(); - if (focus_manager) - focus_manager->SetFocusedView(this); + if (!focus_manager) { + NOTREACHED(); + return; + } + focus_manager->SetFocusedView(this); } //////////////////////////////////////////////////////////////////////////////// @@ -176,7 +179,7 @@ void WebView::AttachWebContents() { void WebView::DetachWebContents() { if (web_contents_) { wcv_holder_->Detach(); -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) // TODO(beng): This should either not be necessary, or be done implicitly by // NativeViewHostWin on Detach(). As it stands, this is needed // so that the view of the detached contents knows to tell the |