Merge 199540 "Fixes couple of bugs triggered on chromeos when re..."

chrome/browser/ui/ash/chrome_shell_delegate.h

Index: chrome/browser/ui/ash/chrome_shell_delegate.h
===================================================================
--- chrome/browser/ui/ash/chrome_shell_delegate.h	(revision 199728)
+++ chrome/browser/ui/ash/chrome_shell_delegate.h	(working copy)
@@ -104,6 +104,8 @@
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
+  class TabRestoreHelper;
+
   void PlatformInit();
 
   // Returns the browser for active ash window if any. Otherwise it searches
@@ -120,6 +122,8 @@
 
   ChromeLauncherController* launcher_delegate_;
 
+  scoped_ptr<TabRestoreHelper> tab_restore_helper_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
 };