diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-13 22:40:10 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-13 22:40:10 +0000 |
| commit | d99bcf2707cd81d8653485cab5d32f4811a58112 (patch) | |
| tree | e7e3b4a4c336753fc59351933ce1daf9077ecf30 | |
| parent | 2849e1dc6d1b625e091330955ff5ab7b8ee32035 (diff) | |
| download | chromium_src-d99bcf2707cd81d8653485cab5d32f4811a58112.zip chromium_src-d99bcf2707cd81d8653485cab5d32f4811a58112.tar.gz chromium_src-d99bcf2707cd81d8653485cab5d32f4811a58112.tar.bz2 | |
Fix build bustage by correcting ifdef
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132284 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/views/controls/webview/webview.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index 4de68b5..4234a8c 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -62,11 +62,8 @@ 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) { - NOTREACHED(); - return; - } - focus_manager->SetFocusedView(this); + if (focus_manager) + focus_manager->SetFocusedView(this); } //////////////////////////////////////////////////////////////////////////////// @@ -179,7 +176,7 @@ void WebView::AttachWebContents() { void WebView::DetachWebContents() { if (web_contents_) { wcv_holder_->Detach(); -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) // 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 |