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

Unified Diff: content/browser/manifest/manifest_manager_host.h

Issue 2435863004: Remove stl_util's deletion function use from content/. (Closed)
Patch Set: minus service worker Created 4 years, 2 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 | « content/browser/download/save_package.cc ('k') | content/browser/manifest/manifest_manager_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/manifest/manifest_manager_host.h
diff --git a/content/browser/manifest/manifest_manager_host.h b/content/browser/manifest/manifest_manager_host.h
index ce593eccd514ad1fc8ad8f4b0ce55c38f03c9439..8edc88be24b1f009d160b4ff06d98bdfb030f51b 100644
--- a/content/browser/manifest/manifest_manager_host.h
+++ b/content/browser/manifest/manifest_manager_host.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_BROWSER_MANIFEST_MANIFEST_MANAGER_HOST_H_
#define CONTENT_BROWSER_MANIFEST_MANIFEST_MANAGER_HOST_H_
+#include <memory>
+
#include "base/callback_forward.h"
#include "base/id_map.h"
#include "base/macros.h"
@@ -38,7 +40,6 @@ class ManifestManagerHost : public WebContentsObserver {
private:
using GetCallbackMap = IDMap<GetManifestCallback, IDMapOwnPointer>;
- using FrameGetCallbackMap = base::hash_map<RenderFrameHost*, GetCallbackMap*>;
void OnRequestManifestResponse(
RenderFrameHost*, int request_id, const GURL&, const Manifest&);
@@ -46,7 +47,8 @@ class ManifestManagerHost : public WebContentsObserver {
// Returns the CallbackMap associated with the given RenderFrameHost, or null.
GetCallbackMap* GetCallbackMapForFrame(RenderFrameHost*);
- FrameGetCallbackMap pending_get_callbacks_;
+ base::hash_map<RenderFrameHost*, std::unique_ptr<GetCallbackMap>>
+ pending_get_callbacks_;
DISALLOW_COPY_AND_ASSIGN(ManifestManagerHost);
};
« no previous file with comments | « content/browser/download/save_package.cc ('k') | content/browser/manifest/manifest_manager_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698