Add KeepAliveStateObserver, add the Restart option

chrome/browser/ui/views/profiles/user_manager_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/profiles/user_manager_view.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ skipping 218 matching lines @@
   views::DialogDelegate::CreateDialogWidget(delegate, nullptr, parent);
   delegate->GetWidget()->Show();
 }
 
 // UserManagerView -------------------------------------------------------------
 
 UserManagerView::UserManagerView()
     : web_view_(NULL),
       user_manager_started_showing_(base::Time()) {
 #if !defined(USE_ASH)
-  keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::USER_MANAGER_VIEW));
+  keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::USER_MANAGER_VIEW,
+                                        KeepAliveRestartOption::DISABLED));
 #endif  // !defined(USE_ASH)
 }
 
 UserManagerView::~UserManagerView() {
 }
 
 // static
 void UserManagerView::OnSystemProfileCreated(
     scoped_ptr<UserManagerView> instance,
     base::AutoReset<bool>* pending,
@@ skipping 127 matching lines @@
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (instance_ == this)
     instance_ = NULL;
 }
 
 bool UserManagerView::UseNewStyleForThisDialog() const {
   return false;
 }