gesture-nav: Use a WebContentsObserver to more reliably dismiss the navigation overlay.

content/browser/renderer_host/render_widget_host_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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 72 matching lines @@
       public aura::client::ActivationChangeObserver,
       public aura::client::FocusChangeObserver,
       public aura::client::CursorClientObserver,
       public ImageTransportFactoryObserver,
       public BrowserAccessibilityDelegate,
       public SoftwareFrameManagerClient,
       public DelegatedFrameEvictorClient,
       public base::SupportsWeakPtr<RenderWidgetHostViewAura>,
       public cc::DelegatedFrameResourceCollectionClient {
  public:
-  // Used to notify whenever the paint-content of the view changes.
-  class PaintObserver {
-   public:
-    PaintObserver() {}
-    virtual ~PaintObserver() {}
-
-    // This is called when painting of the page is completed.
-    virtual void OnPaintComplete() = 0;
-
-    // This is called when compositor painting of the page is completed.
-    virtual void OnCompositingComplete() = 0;
-
-    // This is called when the contents for compositor painting changes.
-    virtual void OnUpdateCompositorContent() = 0;
-
-    // This is called loading the page has completed.
-    virtual void OnPageLoadComplete() = 0;
-
-    // This is called when the view is destroyed, so that the observer can
-    // perform any necessary clean-up.
-    virtual void OnViewDestroyed() = 0;
-  };
-
   // Displays and controls touch editing elements such as selection handles.
   class TouchEditingClient {
    public:
     TouchEditingClient() {}
 
     // Tells the client to start showing touch editing handles.
     virtual void StartTouchEditing() = 0;
 
     // Notifies the client that touch editing is no longer needed. |quick|
     // determines whether the handles should fade out quickly or slowly.
@@ skipping 14 matching lines @@
     virtual void GestureEventAck(int gesture_event_type) = 0;
 
     // This is called when the view is destroyed, so that the client can
     // perform any necessary clean-up.
     virtual void OnViewDestroyed() = 0;
 
    protected:
     virtual ~TouchEditingClient() {}
   };
 
-  void set_paint_observer(PaintObserver* observer) {
-    paint_observer_ = observer;
-  }
-
   void set_touch_editing_client(TouchEditingClient* client) {
     touch_editing_client_ = client;
   }
 
   // RenderWidgetHostView implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
   virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
   virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
@@ skipping 582 matching lines @@
 
   // Used to track the last cursor visibility update that was sent to the
   // renderer via NotifyRendererOfCursorVisibilityState().
   enum CursorVisibilityState {
     UNKNOWN,
     VISIBLE,
     NOT_VISIBLE,
   };
   CursorVisibilityState cursor_visibility_state_in_renderer_;
 
-  // An observer to notify that the paint content of the view has changed. The
-  // observer is not owned by the view, and must remove itself as an oberver
-  // when it is being destroyed.
-  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.
   std::vector<gfx::Rect> constrained_rects_;
 
   typedef std::map<HWND, WebPluginGeometry> PluginWindowMoves;
   // Contains information about each windowed plugin's clip and cutout rects (
   // from the renderer). This is needed because when the transient windoiws
   // over this view changes, we need this information in order to create a new
   // region for the HWND.
@@ skipping 33 matching lines @@
   // passed to windowless plugins like Flash/Silverlight, etc as the
   // container window.
   HWND plugin_parent_window_;
 #endif
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_