Index: chrome/browser/ui/views/profiles/user_manager_view.cc |
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc |
index 87d56b97a998d84998ad4d599b2e1cf3db40c78b..e3d1857ee0637d196231cd455eb49498ef933066 100644 |
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc |
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc |
@@ -9,7 +9,7 @@ |
#include "base/time/time.h" |
#include "build/build_config.h" |
#include "chrome/browser/browser_process.h" |
-#include "chrome/browser/lifetime/application_lifetime.h" |
+#include "chrome/browser/lifetime/scoped_keep_alive.h" |
#include "chrome/browser/profiles/profile_avatar_icon_util.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/profiles/profile_metrics.h" |
@@ -234,9 +234,8 @@ void UserManager::ShowReauthDialog(content::BrowserContext* browser_context, |
UserManagerView::UserManagerView() |
: web_view_(NULL), |
- keep_alive_(new AutoKeepAlive(NULL)), |
- user_manager_started_showing_(base::Time()) { |
-} |
+ keep_alive_(AutoKeepAlive(nullptr)), |
dgn
2016/02/22 18:01:20
not sure about this one. AFAIK it is not used on C
|
+ user_manager_started_showing_(base::Time()) {} |
UserManagerView::~UserManagerView() { |
} |