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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

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: fix build Created 5 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
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index f3d283e9076129a5e4c7e65951365ef35b6a9793..6a0fdd387e857f945b644e236f1b2c8e571a2629 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -55,6 +55,7 @@
#include "chrome/browser/chromeos/system/timezone_util.h"
#include "chrome/browser/chromeos/ui/focus_ring_controller.h"
#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/browser_keep_alive.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "chrome/common/chrome_constants.h"
@@ -307,7 +308,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
default_host_ = this;
// Make sure chrome won't exit while we are at login/oobe screen.
- chrome::IncrementKeepAliveCount();
+ browser_lifetime::IncrementKeepAliveCount();
bool is_registered = StartupUtils::IsDeviceRegistered();
bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
@@ -397,7 +398,7 @@ LoginDisplayHostImpl::~LoginDisplayHostImpl() {
ResetLoginWindowAndView();
// Let chrome process exit after login/oobe screen if needed.
- chrome::DecrementKeepAliveCount();
+ browser_lifetime::DecrementKeepAliveCount();
default_host_ = NULL;
// TODO(tengs): This should be refactored. See crbug.com/314934.

Powered by Google App Engine
This is Rietveld 408576698