Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: chrome/browser/ui/apps/chrome_app_delegate.h

Issue 557833007: Remove Increment/DecrementKeepAliveCount from AppsClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/scoped_keep_alive.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/browser/ui/app_list/scoped_keep_alive.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698