gtk: Improve fullscreen RenderWidgetHostViewGtk.

chrome/browser/renderer_host/render_widget_host_view_gtk.h

 // Copyright (c) 2011 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 #pragma once
 
 #include <gdk/gdk.h>
 
@@ skipping 36 matching lines @@
  public:
   explicit RenderWidgetHostViewGtk(RenderWidgetHost* widget);
   ~RenderWidgetHostViewGtk();
 
   // Initialize this object for use as a drawing area.
   void InitAsChild();
 
   // RenderWidgetHostView implementation.
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
                            const gfx::Rect& pos);
-  virtual void InitAsFullscreen(RenderWidgetHostView* parent_host_view);
+  virtual void InitAsFullscreen();
   virtual RenderWidgetHost* GetRenderWidgetHost() const;
   virtual void DidBecomeSelected();
   virtual void WasHidden();
   virtual void SetSize(const gfx::Size& size);
   virtual gfx::NativeView GetNativeView();
   virtual void MovePluginWindows(
       const std::vector<webkit::npapi::WebPluginGeometry>& moves);
   virtual void Focus();
   virtual void Blur();
   virtual bool HasFocus();
@@ skipping 53 matching lines @@
 
  private:
   friend class RenderWidgetHostViewGtkWidget;
 
   // 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).
-  bool IsPopup();
+  bool IsPopup() const;
+
+  // Do initialization needed by all InitAs*() methods.
+  void DoSharedInit();
+
+  // Do initialization needed just by InitAsPopup() and InitAsFullscreen().
+  // We move and resize |window| to |bounds| and show it and its contents.
+  void DoPopupOrFullscreenInit(GtkWindow* window, const gfx::Rect& bounds);
 
   // Update the display cursor for the render view.
   void ShowCurrentCursor();
 
-  // Helper method for InitAsPopup() and InitAsFullscreen().
-  void DoInitAsPopup(
-      RenderWidgetHostView* parent_host_view,
-      GtkWindowType window_type,
-      const gfx::Rect& pos,  // Ignored if is_fullscreen is true.
-      bool is_fullscreen);
-
   // The model object.
   RenderWidgetHost* host_;
 
   // The native UI widget.
   OwnedWidgetGtk view_;
 
   // This is true when we are currently painting and thus should handle extra
   // paint requests by expanding the invalid rect rather than actually
   // painting.
   bool about_to_validate_and_paint_;
 
   // This is the rectangle which we'll paint.
   gfx::Rect invalid_rect_;
 
   // Whether or not this widget is hidden.
   bool is_hidden_;
 
   // Whether we are currently loading.
   bool is_loading_;
+
   // The cursor for the page. This is passed up from the renderer.
   WebCursor current_cursor_;
 
   // Whether we are showing a context menu.
   bool is_showing_context_menu_;
 
   // The time at which this view started displaying white pixels as a result of
   // not having anything to paint (empty backing store from renderer). This
   // value returns true for is_null() if we are not recording whiteout times.
   base::TimeTicks whiteout_start_time_;
 
   // The time it took after this view was selected for it to be fully painted.
   base::TimeTicks tab_switch_paint_time_;
 
   // A color we use to shade the entire render view. If 100% transparent, we do
   // not shade the render view.
   SkColor overlay_color_;
 
   // The animation used for the abovementioned shade effect. The animation's
   // value affects the alpha we use for |overlay_color_|.
   ui::SlideAnimation overlay_animation_;
 
-  // Variables used only for popups --------------------------------------------
-  // Our parent widget.
-  RenderWidgetHostView* parent_host_view_;
-  // The native view of our parent, equivalent to
-  // parent_host_view_->GetNativeView().
+  // The native view of our parent widget.  Used only for popups.
   GtkWidget* parent_;
-  // We ignore the first mouse release on popups.  This allows the popup to
-  // stay open.
+
+  // We ignore the first mouse release on popups so the popup will remain open.
   bool is_popup_first_mouse_release_;
 
   // Whether or not this widget was focused before shadowed by another widget.
   // Used in OnGrabNotify() handler to track the focused state correctly.
   bool was_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_;
+
   // A convenience wrapper object for GtkIMContext;
   scoped_ptr<GtkIMContextWrapper> im_context_;
 
   // A convenience object for handling editor key bindings defined in gtk
   // keyboard theme.
   scoped_ptr<GtkKeyBindingsHandler> key_bindings_handler_;
 
   // Helper class that lets us allocate plugin containers and move them.
   webkit::npapi::GtkPluginContainerManager plugin_container_manager_;
 
@@ skipping 11 matching lines @@
   // indicate the top edge, positive the bottom.
   int dragged_at_vertical_edge_;
 
 #if defined(OS_CHROMEOS)
   // Custimized tooltip window.
   scoped_ptr<views::TooltipWindowGtk> tooltip_window_;
 #endif  // defined(OS_CHROMEOS)
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_