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

Unified Diff: ui/views/corewm/tooltip_controller.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/views/corewm/tooltip_aura.cc ('k') | ui/views/corewm/tooltip_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/tooltip_controller.h
diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h
index 5171726c5dc21cb37a6ecf420ee90e3042f6beff..5a274e319cd5edea134ef540a759884c323edbe0 100644
--- a/ui/views/corewm/tooltip_controller.h
+++ b/ui/views/corewm/tooltip_controller.h
@@ -6,9 +6,9 @@
#define UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_
#include <map>
+#include <memory>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/timer/timer.h"
#include "ui/aura/window_observer.h"
@@ -35,7 +35,7 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
public ui::EventHandler,
public aura::WindowObserver {
public:
- explicit TooltipController(scoped_ptr<Tooltip> tooltip);
+ explicit TooltipController(std::unique_ptr<Tooltip> tooltip);
~TooltipController() override;
// Overridden from aura::client::TooltipClient.
@@ -88,7 +88,7 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
aura::Window* tooltip_window_at_mouse_press_;
base::string16 tooltip_text_at_mouse_press_;
- scoped_ptr<Tooltip> tooltip_;
+ std::unique_ptr<Tooltip> tooltip_;
base::RepeatingTimer tooltip_timer_;
« no previous file with comments | « ui/views/corewm/tooltip_aura.cc ('k') | ui/views/corewm/tooltip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698