Defer app window appearance until first paint.

apps/shell_window.h

 // Copyright 2013 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 APPS_SHELL_WINDOW_H_
 #define APPS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/console_message_level.h"
 #include "ui/base/ui_base_types.h"  // WindowShowState
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class Profile;
 class SkRegion;
 
 namespace content {
@@ skipping 40 matching lines @@
   virtual content::WebContents* GetWebContents() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellWindowContents);
 };
 
 // ShellWindow is the type of window used by platform apps. Shell windows
 // have a WebContents but none of the chrome of normal browser windows.
 class ShellWindow : public content::NotificationObserver,
                     public content::WebContentsDelegate,
+                    public content::WebContentsObserver,
                     public web_modal::WebContentsModalDialogManagerDelegate,
                     public extensions::ExtensionKeybindingRegistry::Delegate,
                     public extensions::IconImage::Observer {
  public:
   enum WindowType {
     WINDOW_TYPE_DEFAULT  = 1 << 0,  // Default shell window.
     WINDOW_TYPE_PANEL    = 1 << 1,  // OS controlled panel window (Ash only).
     WINDOW_TYPE_V1_PANEL = 1 << 2,  // For apps v1 support in Ash; deprecate
                                     // with v1 apps.
   };
@@ skipping 192 matching lines @@
   // on chrome.app.window API.
   void Fullscreen();
   void Maximize();
   void Minimize();
   void Restore();
 
   // Set the minimum and maximum size that this window is allowed to be.
   void SetMinimumSize(const gfx::Size& min_size);
   void SetMaximumSize(const gfx::Size& max_size);
 
+  enum ShowType {
+    SHOW_ACTIVE,
+    SHOW_INACTIVE
+  };
+
+  // Shows the window if its contents have been painted; otherwise flags the
+  // window to be shown as soon as its contents are painted for the first time.
+  void Show(ShowType show_type);
+
+  // Hides the window. If the window was previously flagged to be shown on
+  // first paint, it will be unflagged.
+  void Hide();
+
   ShellWindowContents* shell_window_contents_for_test() {
     return shell_window_contents_.get();
   }
 
   // Get the size constraints.
   const SizeConstraints& size_constraints() const {
     return size_constraints_;
   }
 
  protected:
@@ skipping 34 matching lines @@
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual void RequestToLockMouse(content::WebContents* web_contents,
                                   bool user_gesture,
                                   bool last_unlocked_by_target) OVERRIDE;
 
+  // content::WebContentsObserver implementation.
+  virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE;
+
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // web_modal::WebContentsModalDialogManagerDelegate implementation.
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) OVERRIDE;
   virtual bool IsWebContentsVisible(
       content::WebContents* web_contents) OVERRIDE;
@@ skipping 74 matching lines @@
   base::WeakPtrFactory<ShellWindow> image_loader_ptr_factory_;
 
   // Fullscreen entered by app.window api.
   bool fullscreen_for_window_api_;
   // Fullscreen entered by HTML requestFullscreen.
   bool fullscreen_for_tab_;
 
   // Size constraints on the window.
   SizeConstraints size_constraints_;
 
+  // Show has been called, so the window should be shown once the first visually
+  // non-empty paint occurs.
+  bool show_on_first_paint_;
+
+  // The first visually non-empty paint has completed.
+  bool first_paint_complete_;
+
+  // Whether the delayed Show() call was for an active or inactive window.
+  ShowType delayed_show_type_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_WINDOW_H_