Revert 233297 "Fix windowed NPAPI plugins covering up dialogs on..."

trunk/src/content/browser/web_contents/web_contents_view_aura.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 32 matching lines @@
  public:
   WebContentsViewAura(WebContentsImpl* web_contents,
                       WebContentsViewDelegate* delegate);
 
   void SetupOverlayWindowForTesting();
 
   void SetTouchEditableForTest(TouchEditableImplAura* touch_editable);
 
  private:
   class WindowObserver;
+#if defined(OS_WIN)
+  class ChildWindowObserver;
+#endif
 
   virtual ~WebContentsViewAura();
 
   void SizeChangedCommon(const gfx::Size& size);
 
   void EndDrag(WebKit::WebDragOperationsMask ops);
 
   // Creates and sets up the overlay window that will be displayed during the
   // overscroll gesture.
   void PrepareOverscrollWindow();
@@ skipping 120 matching lines @@
   virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
 
   scoped_ptr<aura::Window> window_;
 
   // The window that shows the screenshot of the history page during an
   // overscroll navigation gesture.
   scoped_ptr<aura::Window> overscroll_window_;
 
   scoped_ptr<WindowObserver> window_observer_;
+#if defined(OS_WIN)
+  scoped_ptr<ChildWindowObserver> child_window_observer_;
+#endif
 
   // The WebContentsImpl whose contents we display.
   WebContentsImpl* web_contents_;
 
   scoped_ptr<WebContentsViewDelegate> delegate_;
 
   WebKit::WebDragOperationsMask current_drag_op_;
 
   scoped_ptr<DropData> current_drop_data_;
 
@@ skipping 21 matching lines @@
   scoped_ptr<ShadowLayerDelegate> overscroll_shadow_;
 
   scoped_ptr<TouchEditableImplAura> touch_editable_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_