| Index: chrome/browser/ui/views/panels/panel_view.cc
|
| diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc
|
| index 075a15d5d7ed73979e91b5ae16412a796c1c3624..25d46920e6abd07ecd5fd4414cc7c77c9d9bc5b3 100644
|
| --- a/chrome/browser/ui/views/panels/panel_view.cc
|
| +++ b/chrome/browser/ui/views/panels/panel_view.cc
|
| @@ -181,7 +181,7 @@ bool NativePanelTestingViews::VerifyAppIcon() const {
|
| ::SendMessage(native_window, WM_GETICON, ICON_BIG, 0L));
|
| if (!app_icon)
|
| return false;
|
| - scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(app_icon));
|
| + std::unique_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(app_icon));
|
| return bitmap.get() &&
|
| bitmap->width() == panel::kPanelAppIconSize &&
|
| bitmap->height() == panel::kPanelAppIconSize;
|
| @@ -336,7 +336,7 @@ PanelView::PanelView(Panel* panel, const gfx::Rect& bounds, bool always_on_top)
|
| views::DesktopWindowTreeHostX11* host =
|
| views::DesktopWindowTreeHostX11::GetHostForXID(
|
| window_->GetNativeView()->GetHost()->GetAcceleratedWidget());
|
| - scoped_ptr<ui::EventHandler> resizer(
|
| + std::unique_ptr<ui::EventHandler> resizer(
|
| new X11PanelResizer(panel_.get(), window_->GetNativeWindow()));
|
| host->SwapNonClientEventHandler(std::move(resizer));
|
| #endif
|
|
|