Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

chrome/browser/ui/panels/panel.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/panels/panel.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/task_management/web_contents_tags.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel_collection.h"
 #include "chrome/browser/ui/panels/panel_host.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/stacked_panel_collection.h"
@@ skipping 125 matching lines @@
 bool PanelExtensionWindowController::IsVisibleToExtension(
     const extensions::Extension* extension) const {
   DCHECK(extension);
   return extension->id() == panel_->extension_id();
 }
 
 }  // namespace panel_internal
 
 Panel::~Panel() {
   DCHECK(!collection_);
-#if !defined(USE_AURA)
-  // Invoked by native panel destructor. Do not access native_panel_ here.
-  chrome::DecrementKeepAliveCount();  // Remove shutdown prevention.
-#endif
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
 
 const std::string Panel::extension_id() const {
   return web_app::GetExtensionIdFromApplicationName(app_name_);
 }
 
@@ skipping 368 matching lines @@
   }
 
   // Close when the extension is unloaded or the browser is exiting.
   extension_registry_->AddObserver(this);
   registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                     ThemeServiceFactory::GetForProfile(profile_)));
 
+// TODO(dgn): Should keep_alive be always registered regardless of the platform
+// here? (https://crbug.com/590173)
 #if !defined(USE_AURA)
   // Keep alive for AURA has been moved to panel_view.
   // Prevent the browser process from shutting down while this window is open.
-  chrome::IncrementKeepAliveCount();
+  keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::PANEL,
+                                        KeepAliveRestartOption::DISABLED));
 #endif
 
   UpdateAppIcon();
 }
 
 void Panel::SetPanelBounds(const gfx::Rect& bounds) {
   if (bounds != native_panel_->GetPanelBounds())
     native_panel_->SetPanelBounds(bounds);
 }
 
@@ skipping 328 matching lines @@
 // static
 void Panel::FormatTitleForDisplay(base::string16* title) {
   size_t current_index = 0;
   size_t match_index;
   while ((match_index = title->find(L'\n', current_index)) !=
          base::string16::npos) {
     title->replace(match_index, 1, base::string16());
     current_index = match_index;
   }
 }