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

Unified Diff: chrome/browser/ui/views/panels/panel_view.h

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
« no previous file with comments | « chrome/browser/ui/views/panels/panel_stack_view.h ('k') | chrome/browser/ui/views/panels/panel_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/panels/panel_view.h
diff --git a/chrome/browser/ui/views/panels/panel_view.h b/chrome/browser/ui/views/panels/panel_view.h
index 2b584ce67a287ff96a8c71649a579c50d971528f..f7e7f35bafcb7d56be59609a29c7b2e57c3be266 100644
--- a/chrome/browser/ui/views/panels/panel_view.h
+++ b/chrome/browser/ui/views/panels/panel_view.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_
#define CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "chrome/browser/ui/panels/native_panel.h"
#include "ui/gfx/animation/animation_delegate.h"
@@ -177,7 +178,7 @@ class PanelView : public NativePanel,
bool update_frame);
#endif
- scoped_ptr<Panel> panel_;
+ std::unique_ptr<Panel> panel_;
gfx::Rect bounds_;
// The window that holds all panel views. Lifetime managed by native widget.
@@ -226,7 +227,7 @@ class PanelView : public NativePanel,
MouseDraggingState mouse_dragging_state_;
// Used to animate the bounds change.
- scoped_ptr<PanelBoundsAnimation> bounds_animator_;
+ std::unique_ptr<PanelBoundsAnimation> bounds_animator_;
gfx::Rect animation_start_bounds_;
// Is the panel in highlighted state to draw people's attention?
@@ -240,11 +241,11 @@ class PanelView : public NativePanel,
// be restored properly when a drag ends.
views::View* old_focused_view_;
- scoped_ptr<ScopedKeepAlive> keep_alive_;
+ std::unique_ptr<ScopedKeepAlive> keep_alive_;
#if defined(OS_WIN)
// Used to provide custom taskbar thumbnail for Windows 7 and later.
- scoped_ptr<TaskbarWindowThumbnailerWin> thumbnailer_;
+ std::unique_ptr<TaskbarWindowThumbnailerWin> thumbnailer_;
#endif
DISALLOW_COPY_AND_ASSIGN(PanelView);
« no previous file with comments | « chrome/browser/ui/views/panels/panel_stack_view.h ('k') | chrome/browser/ui/views/panels/panel_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698