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

Unified Diff: chrome/browser/ui/views/web_contents_modal_dialog_manager_views.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/views/web_contents_modal_dialog_manager_views.cc
diff --git a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
index 0891ed254b60e0d8593fa1368ffea26d190980b5..be58bd1b72aab75c874d3e27db51e5f4f8513720 100644
--- a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
+++ b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
#include <set>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/platform_util.h"
#include "components/constrained_window/constrained_window_views.h"
#include "components/web_modal/single_web_contents_dialog_manager.h"
@@ -102,7 +102,7 @@ class NativeWebContentsModalDialogManagerViews
views::Widget* widget = GetWidget(dialog());
#if defined(USE_AURA)
- scoped_ptr<wm::SuspendChildWindowVisibilityAnimations> suspend;
+ std::unique_ptr<wm::SuspendChildWindowVisibilityAnimations> suspend;
if (shown_widgets_.find(widget) != shown_widgets_.end()) {
suspend.reset(new wm::SuspendChildWindowVisibilityAnimations(
widget->GetNativeWindow()->parent()));
@@ -125,7 +125,7 @@ class NativeWebContentsModalDialogManagerViews
void Hide() override {
views::Widget* widget = GetWidget(dialog());
#if defined(USE_AURA)
- scoped_ptr<wm::SuspendChildWindowVisibilityAnimations> suspend;
+ std::unique_ptr<wm::SuspendChildWindowVisibilityAnimations> suspend;
suspend.reset(new wm::SuspendChildWindowVisibilityAnimations(
widget->GetNativeWindow()->parent()));
#endif
« no previous file with comments | « chrome/browser/ui/views/uninstall_view.h ('k') | chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698