Merge 143306 - Rely on losing focus, not on becoming unfullscreened, to destroy a fullscreen window.

content/browser/renderer_host/render_widget_host_view_gtk.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_GTK_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 #pragma once
 
 #include <gdk/gdk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/content_export.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
+#include "ui/base/x/active_window_watcher_x_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
 
 class GtkIMContextWrapper;
 
 namespace content {
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct NativeWebKeyboardEvent;
 }
 
 class GtkKeyBindingsHandler;
 
 typedef struct _GtkClipboard GtkClipboard;
 typedef struct _GtkSelectionData GtkSelectionData;
 
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT RenderWidgetHostViewGtk
     : public content::RenderWidgetHostViewBase,
-      public BrowserAccessibilityDelegate {
+      public BrowserAccessibilityDelegate,
+      public ui::ActiveWindowWatcherXObserver {
  public:
   virtual ~RenderWidgetHostViewGtk();
 
   // RenderWidgetHostView implementation.
   virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
   virtual content::RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
   virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
@@ skipping 61 matching lines @@
       bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
   virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
   virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
   virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
   virtual bool LockMouse() OVERRIDE;
   virtual void UnlockMouse() OVERRIDE;
   virtual void OnAccessibilityNotifications(
       const std::vector<AccessibilityHostMsg_NotificationParams>& params)
       OVERRIDE;
 
+  // ActiveWindowWatcherXObserver implementation.
+  virtual void ActiveWindowChanged(GdkWindow* active_window) OVERRIDE;
+
   // If the widget is aligned with an edge of the monitor its on and the user
   // attempts to drag past that edge we track the number of times it has
   // occurred, so that we can force the widget to scroll when it otherwise
   // would be unable to.
   void ModifyEventForEdgeDragging(GtkWidget* widget, GdkEventMotion* event);
 
   // Mouse events always provide a movementX/Y which needs to be computed.
   // Also, mouse lock requires knowledge of last unlocked cursor coordinates.
   // State is stored on the host view to do this, and the mouse event modified.
   void ModifyEventMovementAndCoords(WebKit::WebMouseEvent* event);
@@ skipping 25 matching lines @@
 
  protected:
   friend class content::RenderWidgetHostView;
 
   // Should construct only via RenderWidgetHostView::CreateViewForWidget.
   explicit RenderWidgetHostViewGtk(content::RenderWidgetHost* widget);
 
  private:
   friend class RenderWidgetHostViewGtkWidget;
 
-  CHROMEGTK_CALLBACK_1(RenderWidgetHostViewGtk,
-                       gboolean,
-                       OnWindowStateEvent,
-                       GdkEventWindowState*);
-
   CHROMEGTK_CALLBACK_0(RenderWidgetHostViewGtk,
                        void,
                        OnDestroy);
 
   // Returns whether the widget needs an input grab (GTK+ and X) to work
   // properly.
   bool NeedsInputGrab();
 
   // Returns whether this render view is a popup (<select> dropdown or
   // autocomplete window).
@@ skipping 59 matching lines @@
   bool was_imcontext_focused_before_grab_;
 
   // True if we are responsible for creating an X grab. This will only be used
   // for <select> dropdowns. It should be true for most such cases, but false
   // for extension popups.
   bool do_x_grab_;
 
   // Is the widget fullscreen?
   bool is_fullscreen_;
 
+  // Has the window ever been marked active? Only valid for fullscreen or
+  // popup windows.
+  bool made_active_;
+
   // Used to record the last position of the mouse.
   // While the mouse is locked, they store the last known position just as mouse
   // lock was entered.
   // Relative to the upper-left corner of the view.
   gfx::Point unlocked_mouse_position_;
   // Relative to the upper-left corner of the screen.
   gfx::Point unlocked_global_mouse_position_;
   // Last hidden cursor position. Relative to screen.
   gfx::Point global_mouse_position_;
   // Indicates when mouse motion is valid after the widget has moved.
@@ skipping 39 matching lines @@
   GdkEventButton* last_mouse_down_;
 
   // Instance of accessibility information for the root of the AtkObject
   // tree representation of the WebKit render tree.
   scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;
 
   ui::GtkSignalRegistrar signals_;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_