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

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

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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/profile_loader.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 1a7ac1f1c5bc15163691981ac6008d50929fed3e..941c71951bb420c1f0f03f7f6345c0848d78151f 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.h
+++ b/chrome/browser/ui/apps/chrome_app_delegate.h
@@ -14,14 +14,17 @@
#include "ui/base/window_open_disposition.h"
#include "ui/gfx/geometry/rect.h"
+namespace browser_lifetime {
class ScopedKeepAlive;
+}
class ChromeAppDelegate : public extensions::AppDelegate,
public content::NotificationObserver {
public:
// Pass a ScopedKeepAlive to prevent the browser process from shutting down
// while this object exists.
- explicit ChromeAppDelegate(scoped_ptr<ScopedKeepAlive> keep_alive);
+ explicit ChromeAppDelegate(
+ scoped_ptr<browser_lifetime::ScopedKeepAlive> keep_alive);
~ChromeAppDelegate() override;
static void DisableExternalOpenForTesting();
@@ -76,7 +79,7 @@ class ChromeAppDelegate : public extensions::AppDelegate,
bool has_been_shown_;
bool is_hidden_;
- scoped_ptr<ScopedKeepAlive> keep_alive_;
+ scoped_ptr<browser_lifetime::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/profile_loader.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