Revert 132284 - Fix build bustage by correcting ifdef

ui/views/controls/webview/webview.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/webview/webview.h"
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 44 matching lines @@
   AttachWebContents();
 }
 
 void WebView::SetFastResize(bool fast_resize) {
   wcv_holder_->set_fast_resize(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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, View overrides:
 
 void WebView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   wcv_holder_->SetSize(bounds().size());
 }
 
 void WebView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
@@ skipping 92 matching lines @@
     registrar_.Add(
         this,
         content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<content::WebContents>(web_contents_));
   }
 }
 
 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
     //             renderer its been hidden.
     ShowWindow(web_contents_->GetNativeView(), SW_HIDE);
 #endif
   }
   registrar_.RemoveAll();
 }
 
 void WebView::RenderViewHostChanged(content::RenderViewHost* old_host,
                                     content::RenderViewHost* new_host) {
   if (GetFocusManager()->GetFocusedView() == this)
     web_contents_->Focus();
 }
 
 void WebView::WebContentsDestroyed(content::WebContents* web_contents) {
   DCHECK(web_contents == web_contents_);
   SetWebContents(NULL);
 }
 
 }  // namespace views