Add ScopedKeepAlive to c/b/lifetime

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

 // Copyright (c) 2012 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/panels/panel_view.h"
 
 #include <stddef.h>
 #include <map>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #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"
 #include "content/public/browser/web_contents.h"
 #include "ui/content_accelerators/accelerator_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/webview/webview.h"
@@ skipping 11 matching lines @@
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "chrome/browser/shell_integration_linux.h"
 #include "chrome/browser/ui/views/panels/x11_panel_resizer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #endif
 
 namespace {
 
+#if !defined(OS_CHROMEOS)
+static const KeepAliveOptions g_keep_alive_options = {"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.
 const int kStackedPanelHeightShrinkThresholdToBecomeMinimized =
     panel::kTitlebarHeight + 20;
 #endif
 
 // Supported accelerators.
 // Note: We can't use the accelerator table defined in chrome/browser/ui/views
 // due to checkdeps violation.
@@ skipping 228 matching lines @@
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
   params.wm_class_name = web_app::GetWMClassFromAppName(panel->app_name());
   params.wm_class_class = shell_integration_linux::GetProgramClassName();
 #endif
 
   window_->Init(params);
   window_->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
   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(&g_keep_alive_options));
+#endif  // !defined(OS_CHROMEOS)
 
   web_view_ = new views::WebView(NULL);
   AddChildView(web_view_);
 
   // Register accelarators supported by panels.
   views::FocusManager* focus_manager = GetFocusManager();
   const std::map<ui::Accelerator, int>& accelerator_table =
       GetAcceleratorTable();
   for (std::map<ui::Accelerator, int>::const_iterator iter =
            accelerator_table.begin();
@@ skipping 828 matching lines @@
   // SWP_FRAMECHANGED flag must be called in order for the cached window data
   // to be updated properly.
   // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633591(v=vs.85).aspx
   if (update_frame) {
     ::SetWindowPos(native_window, NULL, 0, 0, 0, 0,
                    SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
                        SWP_NOZORDER | SWP_NOACTIVATE);
   }
 }
 #endif