| Index: ui/gfx/font_render_params_win.cc
|
| diff --git a/ui/gfx/font_render_params_win.cc b/ui/gfx/font_render_params_win.cc
|
| index b7c3af22922d5882646d601d80537eda7c0e155c..8071323f72f7ff18789eec1f6c7cf627702902fc 100644
|
| --- a/ui/gfx/font_render_params_win.cc
|
| +++ b/ui/gfx/font_render_params_win.cc
|
| @@ -2,14 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "ui/gfx/font_render_params.h"
|
| +
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/win/registry.h"
|
| -#include "ui/gfx/font_render_params.h"
|
| #include "ui/gfx/win/direct_write.h"
|
| #include "ui/gfx/win/singleton_hwnd_observer.h"
|
|
|
| @@ -94,8 +96,8 @@ class CachedFontRenderParams {
|
| }
|
| }
|
|
|
| - scoped_ptr<FontRenderParams> params_;
|
| - scoped_ptr<SingletonHwndObserver> singleton_hwnd_observer_;
|
| + std::unique_ptr<FontRenderParams> params_;
|
| + std::unique_ptr<SingletonHwndObserver> singleton_hwnd_observer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams);
|
| };
|
|
|