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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1708343002: Add ScopedKeepAlive to c/b/lifetime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use singleton instead of browserprocess Created 4 years, 10 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
« chrome/browser/ui/app_list/app_list_view_delegate.cc ('K') | « chrome/browser/ui/app_list/profile_loader.cc ('k') | chrome/browser/ui/apps/chrome_app_window_client.cc » ('j') | chrome/browser/ui/views/auto_keep_alive.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/apps/chrome_app_delegate.cc
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index 8ed8e7f68876af90a12faf4a624659fe591ebf92..5270faa51e127f7865cfc6f2a52ba484ae89b17a 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -10,11 +10,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
-#include "chrome/browser/apps/scoped_keep_alive.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
#include "chrome/browser/favicon/favicon_utils.h"
#include "chrome/browser/file_select_helper.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -345,7 +345,7 @@ void ChromeAppDelegate::OnHide() {
void ChromeAppDelegate::OnShow() {
has_been_shown_ = true;
is_hidden_ = false;
- keep_alive_.reset(new ScopedKeepAlive);
+ keep_alive_.reset(new ScopedKeepAlive("ChromeAppDelegate"));
}
void ChromeAppDelegate::Observe(int type,
« chrome/browser/ui/app_list/app_list_view_delegate.cc ('K') | « chrome/browser/ui/app_list/profile_loader.cc ('k') | chrome/browser/ui/apps/chrome_app_window_client.cc » ('j') | chrome/browser/ui/views/auto_keep_alive.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698