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

trunk/src/content/browser/renderer_host/render_widget_host_view_aura.h

Index: trunk/src/content/browser/renderer_host/render_widget_host_view_aura.h
===================================================================
--- trunk/src/content/browser/renderer_host/render_widget_host_view_aura.h	(revision 233330)
+++ trunk/src/content/browser/renderer_host/render_widget_host_view_aura.h	(working copy)
@@ -395,6 +395,10 @@
 
   class WindowObserver;
   friend class WindowObserver;
+#if defined(OS_WIN)
+  class TransientWindowObserver;
+  friend class TransientWindowObserver;
+#endif
 
   // Overridden from ImageTransportFactoryObserver:
   virtual void OnLostResources() OVERRIDE;
@@ -552,6 +556,11 @@
   BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager();
 
 #if defined(OS_WIN)
+  // Sets the cutout rects from transient windows. These are rectangles that
+  // windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout
+  // rects.
+  void UpdateTransientRects(const std::vector<gfx::Rect>& rects);
+
   // Updates the total list of cutout rects, which is the union of transient
   // windows and constrained windows.
   void UpdateCutoutRects();
@@ -722,8 +731,11 @@
   PaintObserver* paint_observer_;
 
 #if defined(OS_WIN)
-  // The list of rectangles from constrained windows over this view. Windowed
-  // NPAPI plugins shouldn't draw over them.
+  scoped_ptr<TransientWindowObserver> transient_observer_;
+
+  // The list of rectangles from transient and constrained windows over this
+  // view. Windowed NPAPI plugins shouldn't draw over them.
+  std::vector<gfx::Rect> transient_rects_;
   std::vector<gfx::Rect> constrained_rects_;
 
   typedef std::map<HWND, WebPluginGeometry> PluginWindowMoves;