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

Unified Diff: extensions/browser/app_window/app_window.h

Issue 1909773002: Convert //extensions/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « extensions/browser/api_unittest.cc ('k') | extensions/browser/app_window/app_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/app_window/app_window.h
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index e41575dae1a383defc1ffb3041ad6ba1621543f5..e503669ab1f476586879c380811416416f0bf060 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -7,12 +7,12 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/sessions/core/session_id.h"
#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
@@ -272,7 +272,7 @@ class AppWindow : public content::WebContentsDelegate,
void SetAppIconUrl(const GURL& icon_url);
// Set the window shape. Passing a NULL |region| sets the default shape.
- void UpdateShape(scoped_ptr<SkRegion> region);
+ void UpdateShape(std::unique_ptr<SkRegion> region);
// Called from the render interface to modify the draggable regions.
void UpdateDraggableRegions(const std::vector<DraggableRegion>& regions);
@@ -368,7 +368,8 @@ class AppWindow : public content::WebContentsDelegate,
// remove this TODO.
bool is_ime_window() const { return is_ime_window_; }
- void SetAppWindowContentsForTesting(scoped_ptr<AppWindowContents> contents) {
+ void SetAppWindowContentsForTesting(
+ std::unique_ptr<AppWindowContents> contents) {
app_window_contents_ = std::move(contents);
}
@@ -516,12 +517,12 @@ class AppWindow : public content::WebContentsDelegate,
GURL app_icon_url_;
// An object to load the app's icon as an extension resource.
- scoped_ptr<IconImage> app_icon_image_;
+ std::unique_ptr<IconImage> app_icon_image_;
- scoped_ptr<NativeAppWindow> native_app_window_;
- scoped_ptr<AppWindowContents> app_window_contents_;
- scoped_ptr<AppDelegate> app_delegate_;
- scoped_ptr<AppWebContentsHelper> helper_;
+ std::unique_ptr<NativeAppWindow> native_app_window_;
+ std::unique_ptr<AppWindowContents> app_window_contents_;
+ std::unique_ptr<AppDelegate> app_delegate_;
+ std::unique_ptr<AppWebContentsHelper> helper_;
// The initial url this AppWindow was navigated to.
GURL initial_url_;
« no previous file with comments | « extensions/browser/api_unittest.cc ('k') | extensions/browser/app_window/app_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698