| Index: chrome/browser/ui/apps/chrome_app_delegate.h
|
| diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h
|
| index a1771c8796b49530cd3c4c7c98cae9c620dc3a90..8de03903b107c6d74b1f83602d942b5add9b727f 100644
|
| --- a/chrome/browser/ui/apps/chrome_app_delegate.h
|
| +++ b/chrome/browser/ui/apps/chrome_app_delegate.h
|
| @@ -18,10 +18,14 @@ class BrowserContext;
|
| class WebContents;
|
| }
|
|
|
| +class ScopedKeepAlive;
|
| +
|
| class ChromeAppDelegate : public extensions::AppDelegate,
|
| public content::NotificationObserver {
|
| public:
|
| - ChromeAppDelegate();
|
| + // Pass a ScopedKeepAlive to prevent the browser process from shutting down
|
| + // while this object exists.
|
| + explicit ChromeAppDelegate(scoped_ptr<ScopedKeepAlive> keep_alive);
|
| virtual ~ChromeAppDelegate();
|
|
|
| static void DisableExternalOpenForTesting();
|
| @@ -71,6 +75,7 @@ class ChromeAppDelegate : public extensions::AppDelegate,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| + scoped_ptr<ScopedKeepAlive> keep_alive_;
|
| scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_;
|
| base::Closure terminating_callback_;
|
| content::NotificationRegistrar registrar_;
|
|
|