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

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_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
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index e70e8b4ede79d2c9f6a9f2158a3ca52241c2f317..2848ab990646e13bad84dfe247755046eab087fc 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
#define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/view_ids.h"
#include "chrome/browser/ui/views/frame/avatar_button_manager.h"
#include "chrome/browser/ui/views/frame/browser_frame.h"
@@ -172,10 +173,10 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
AvatarButtonManager profile_switcher_;
// Background painter for the window frame.
- scoped_ptr<views::FrameBackground> frame_background_;
+ std::unique_ptr<views::FrameBackground> frame_background_;
// Observer that handles platform dependent configuration.
- scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
+ std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
};

Powered by Google App Engine
This is Rietveld 408576698