Add KeepAliveStateObserver, add the Restart option

chrome/browser/ui/apps/chrome_app_delegate.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/apps/chrome_app_delegate.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 157 matching lines @@
   return NULL;
 }
 
 ChromeAppDelegate::ChromeAppDelegate(bool keep_alive)
     : has_been_shown_(false),
       is_hidden_(true),
       new_window_contents_delegate_(new NewWindowContentsDelegate()),
       weak_factory_(this) {
   if (keep_alive) {
     keep_alive_.reset(
-        new ScopedKeepAlive(keep_alive::Origin::CHROME_APP_DELEGATE));
+        new ScopedKeepAlive(keep_alive::Origin::CHROME_APP_DELEGATE,
+                            keep_alive::RestartOption::DISABLED));
   }
   registrar_.Add(this,
                  chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 }
 
 ChromeAppDelegate::~ChromeAppDelegate() {
   // Unregister now to prevent getting notified if |keep_alive_| is the last.
   terminating_callback_.Reset();
 }
@@ skipping 153 matching lines @@
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&ChromeAppDelegate::RelinquishKeepAliveAfterTimeout,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(kAppWindowFirstShowTimeoutSeconds));
 }
 
 void ChromeAppDelegate::OnShow() {
   has_been_shown_ = true;
   is_hidden_ = false;
-  keep_alive_.reset(
-      new ScopedKeepAlive(keep_alive::Origin::CHROME_APP_DELEGATE));
+  keep_alive_.reset(new ScopedKeepAlive(keep_alive::Origin::CHROME_APP_DELEGATE,
+                                        keep_alive::RestartOption::DISABLED));
 }
 
 void ChromeAppDelegate::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_APP_TERMINATING:
       if (!terminating_callback_.is_null())
         terminating_callback_.Run();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }