Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3220)

Unified Diff: chrome/browser/ui/apps/chrome_app_delegate.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/apps/chrome_app_delegate.cc
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index 35249f7f97d9f491e12d1ebb035dbaf9fab5e816..46cd38bc3c521e0f936940036db74110a180378f 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/ui/apps/chrome_app_delegate.h"
+#include <memory>
#include <utility>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -113,7 +113,8 @@ void ChromeAppDelegate::RelinquishKeepAliveAfterTimeout(
// ChromeAppDelegate which also resets the ScopedKeepAlive. To avoid this,
// move the ScopedKeepAlive out to here and let it fall out of scope.
if (chrome_app_delegate.get() && chrome_app_delegate->is_hidden_)
- scoped_ptr<ScopedKeepAlive>(std::move(chrome_app_delegate->keep_alive_));
+ std::unique_ptr<ScopedKeepAlive>(
+ std::move(chrome_app_delegate->keep_alive_));
}
class ChromeAppDelegate::NewWindowContentsDelegate
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_delegate.h ('k') | chrome/browser/ui/ash/accelerator_commands_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698