Merge 68646 - Makes instant run before unload listeners....

chrome/browser/ui/browser.h

 // Copyright (c) 2010 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_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 22 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/page_zoom.h"
 #include "gfx/rect.h"
 
 class BrowserWindow;
 class Extension;
 class FindBarController;
 class InstantController;
+class InstantUnloadHandler;
 class PrefService;
 class Profile;
 class SessionStorageNamespace;
 class SkBitmap;
 class StatusBubble;
 class TabNavigation;
 class TabStripModel;
 struct WebApplicationInfo;
 namespace gfx {
 class Point;
@@ skipping 1049 matching lines @@
   const Extension* extension_app_;
 
   // Tracks the display mode of the tabstrip.
   mutable BooleanPrefMember use_vertical_tabs_;
 
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   scoped_ptr<InstantController> instant_;
+  scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_