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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 1494833002: Cleanup/ linked_ptr -> scoped_ptr from c/b/ui/webui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « chrome/browser/ui/webui/media_router/query_result_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 6cfd861387c9f8b145fb33472b10025537986213..a57567de7f0b2dd58d8d13e09b9a2e719f157bdf 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -17,8 +17,8 @@
#include "base/i18n/number_formatting.h"
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
-#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted_memory.h"
+#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/path_service.h"
#include "base/prefs/pref_service.h"
@@ -584,7 +584,7 @@ class PrintPreviewHandler::AccessTokenService
void OnServiceResponce(const OAuth2TokenService::Request* request,
const std::string& access_token) {
for (Requests::iterator i = requests_.begin(); i != requests_.end(); ++i) {
- if (i->second == request) {
+ if (i->second.get() == request) {
handler_->SendAccessToken(i->first, access_token);
requests_.erase(i);
return;
@@ -593,8 +593,8 @@ class PrintPreviewHandler::AccessTokenService
NOTREACHED();
}
- typedef std::map<std::string,
- linked_ptr<OAuth2TokenService::Request> > Requests;
+ using Requests =
+ std::map<std::string, scoped_ptr<OAuth2TokenService::Request>>;
Requests requests_;
PrintPreviewHandler* handler_;
« no previous file with comments | « chrome/browser/ui/webui/media_router/query_result_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698