Add ScopedKeepAlive to c/b/lifetime

chrome/browser/ui/views/panels/panel_view.cc

Index: chrome/browser/ui/views/panels/panel_view.cc
diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc
index 9775a2de76037edc08dd156748942d37f79553cf..c0c908a80a9251f6ca0768c6ec3f9c2164166796 100644
--- a/chrome/browser/ui/views/panels/panel_view.cc
+++ b/chrome/browser/ui/views/panels/panel_view.cc
@@ -14,13 +14,14 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/lifetime/keep_alive_options.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/stacked_panel_collection.h"
-#include "chrome/browser/ui/views/auto_keep_alive.h"
 #include "chrome/browser/ui/views/panels/panel_frame_view.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -52,6 +53,10 @@
 
 namespace {
 
+#if !defined(OS_CHROMEOS)
+const KeepAliveOptions kKeepAliveOptions = {"PanelView"};
+#endif  // !defined(OS_CHROMEOS)
+
 #if defined(OS_WIN)
 // If the height of a stacked panel shrinks below this threshold during the
 // user resizing, it will be treated as minimized.
@@ -300,8 +305,11 @@ PanelView::PanelView(Panel* panel, const gfx::Rect& bounds, bool always_on_top)
   window_->set_focus_on_creation(false);
   window_->AddObserver(this);
 
+#if !defined(OS_CHROMEOS)
   // Prevent the browser process from shutting down while this window is open.
-  keep_alive_.reset(new AutoKeepAlive(GetNativePanelWindow()));
+  // Chrome OS already has a mechanism to always stay alive and skips this.
+  keep_alive_.reset(new ScopedKeepAlive(&kKeepAliveOptions));
+#endif  // !defined(OS_CHROMEOS)
 
   web_view_ = new views::WebView(NULL);
   AddChildView(web_view_);