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

Unified Diff: chrome/browser/ui/app_list/search/common/json_response_fetcher.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/app_list/search/common/json_response_fetcher.h
diff --git a/chrome/browser/ui/app_list/search/common/json_response_fetcher.h b/chrome/browser/ui/app_list/search/common/json_response_fetcher.h
index 1a94c1994cbbafe3fd72943f14cd4fd0c408e303..3e2e38accb205a2c1446121f832180175192b95a 100644
--- a/chrome/browser/ui/app_list/search/common/json_response_fetcher.h
+++ b/chrome/browser/ui/app_list/search/common/json_response_fetcher.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_JSON_RESPONSE_FETCHER_H_
#define CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_JSON_RESPONSE_FETCHER_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "net/url_request/url_fetcher_delegate.h"
@@ -35,7 +35,7 @@ class JSONResponseFetcher : public net::URLFetcherDelegate {
public:
// Callback to pass back the parsed json dictionary returned from the server.
// Invoked with NULL if there is an error.
- typedef base::Callback<void(scoped_ptr<base::DictionaryValue>)> Callback;
+ typedef base::Callback<void(std::unique_ptr<base::DictionaryValue>)> Callback;
JSONResponseFetcher(const Callback& callback,
net::URLRequestContextGetter* context_getter);
@@ -47,7 +47,7 @@ class JSONResponseFetcher : public net::URLFetcherDelegate {
private:
// Callbacks for SafeJsonParser.
- void OnJsonParseSuccess(scoped_ptr<base::Value> parsed_json);
+ void OnJsonParseSuccess(std::unique_ptr<base::Value> parsed_json);
void OnJsonParseError(const std::string& error);
// net::URLFetcherDelegate overrides:
@@ -56,7 +56,7 @@ class JSONResponseFetcher : public net::URLFetcherDelegate {
Callback callback_;
net::URLRequestContextGetter* context_getter_;
- scoped_ptr<net::URLFetcher> fetcher_;
+ std::unique_ptr<net::URLFetcher> fetcher_;
base::WeakPtrFactory<JSONResponseFetcher> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(JSONResponseFetcher);
« no previous file with comments | « chrome/browser/ui/app_list/search/arc_app_result.cc ('k') | chrome/browser/ui/app_list/search/common/json_response_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698