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

Unified Diff: chrome/browser/extensions/api/webstore_private/webstore_private_api.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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/extensions/api/webstore_private/webstore_private_api.h
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
index 91a94b6022f01a40bad072e6acfb0d49763f6a77..5f9205baf3d798edbba7cc525dac0e297614e851 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
@@ -5,9 +5,9 @@
#ifndef CHROME_BROWSER_EXTENSIONS_API_WEBSTORE_PRIVATE_WEBSTORE_PRIVATE_API_H_
#define CHROME_BROWSER_EXTENSIONS_API_WEBSTORE_PRIVATE_WEBSTORE_PRIVATE_API_H_
+#include <memory>
#include <string>
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
#include "chrome/browser/extensions/active_install_data.h"
#include "chrome/browser/extensions/bundle_installer.h"
@@ -40,8 +40,9 @@ class WebstorePrivateApi {
// Gets the pending approval for the |extension_id| in |profile|. Pending
// approvals are held between the calls to beginInstallWithManifest and
// completeInstall. This should only be used for testing.
- static scoped_ptr<WebstoreInstaller::Approval> PopApprovalForTesting(
- Profile* profile, const std::string& extension_id);
+ static std::unique_ptr<WebstoreInstaller::Approval> PopApprovalForTesting(
+ Profile* profile,
+ const std::string& extension_id);
};
class WebstorePrivateBeginInstallWithManifest3Function
@@ -77,25 +78,25 @@ class WebstorePrivateBeginInstallWithManifest3Function
ExtensionFunction::ResponseValue BuildResponse(
api::webstore_private::Result result,
const std::string& error);
- scoped_ptr<base::ListValue> CreateResults(
+ std::unique_ptr<base::ListValue> CreateResults(
api::webstore_private::Result result) const;
const Params::Details& details() const { return params_->details; }
ChromeExtensionFunctionDetails chrome_details_;
- scoped_ptr<Params> params_;
+ std::unique_ptr<Params> params_;
- scoped_ptr<ScopedActiveInstall> scoped_active_install_;
+ std::unique_ptr<ScopedActiveInstall> scoped_active_install_;
- scoped_ptr<base::DictionaryValue> parsed_manifest_;
+ std::unique_ptr<base::DictionaryValue> parsed_manifest_;
SkBitmap icon_;
// A dummy Extension object we create for the purposes of using
// ExtensionInstallPrompt to prompt for confirmation of the install.
scoped_refptr<Extension> dummy_extension_;
- scoped_ptr<ExtensionInstallPrompt> install_prompt_;
+ std::unique_ptr<ExtensionInstallPrompt> install_prompt_;
};
class WebstorePrivateCompleteInstallFunction
@@ -124,8 +125,8 @@ class WebstorePrivateCompleteInstallFunction
ChromeExtensionFunctionDetails chrome_details_;
- scoped_ptr<WebstoreInstaller::Approval> approval_;
- scoped_ptr<ScopedActiveInstall> scoped_active_install_;
+ std::unique_ptr<WebstoreInstaller::Approval> approval_;
+ std::unique_ptr<ScopedActiveInstall> scoped_active_install_;
};
class WebstorePrivateInstallBundleFunction
@@ -155,10 +156,10 @@ class WebstorePrivateInstallBundleFunction
ChromeExtensionFunctionDetails chrome_details_;
- scoped_ptr<Params> params_;
+ std::unique_ptr<Params> params_;
- scoped_ptr<extensions::BundleInstaller> bundle_;
- scoped_ptr<chrome::BitmapFetcher> icon_fetcher_;
+ std::unique_ptr<extensions::BundleInstaller> bundle_;
+ std::unique_ptr<chrome::BitmapFetcher> icon_fetcher_;
};
class WebstorePrivateEnableAppLauncherFunction

Powered by Google App Engine
This is Rietveld 408576698