components/page_load_metrics/browser/metrics_web_contents_observer.h - Issue 1468013002: ScopedPtrMap -> std::map from /component

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/page_load_metrics/browser/metrics_web_contents_observer.h

Issue 1468013002: ScopedPtrMap -> std::map from /component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nit Created 5 years, 1 month 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 | « components/gcm_driver/instance_id/instance_id_driver.cc ('k') | components/page_load_metrics/browser/metrics_web_contents_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/page_load_metrics/browser/metrics_web_contents_observer.h

diff --git a/components/page_load_metrics/browser/metrics_web_contents_observer.h b/components/page_load_metrics/browser/metrics_web_contents_observer.h

index 1c8a4e5d8484b9edd34034c39906a9713e598174..7ad09b55da63a4dea853e2541e0b187d46962b4b 100644

--- a/components/page_load_metrics/browser/metrics_web_contents_observer.h

+++ b/components/page_load_metrics/browser/metrics_web_contents_observer.h

@@ -5,7 +5,8 @@

#ifndef COMPONENTS_PAGE_LOAD_METRICS_BROWSER_PAGE_LOAD_METRICS_WEB_CONTENTS_OBSERVER_H_

#define COMPONENTS_PAGE_LOAD_METRICS_BROWSER_PAGE_LOAD_METRICS_WEB_CONTENTS_OBSERVER_H_

-#include "base/containers/scoped_ptr_map.h"

+#include <map>

#include "base/macros.h"

#include "base/observer_list.h"

#include "base/time/time.h"

@@ -290,7 +291,7 @@ class MetricsWebContentsObserver

// yet. Once a navigation is committed, it moves from the map to

// committed_load_. Note that a PageLoadTrackers NavigationHandle is only

// valid until commit time, when we remove it from the map.

- base::ScopedPtrMap<content::NavigationHandle*, scoped_ptr<PageLoadTracker>>

+ std::map<content::NavigationHandle*, scoped_ptr<PageLoadTracker>>

provisional_loads_;

scoped_ptr<PageLoadTracker> committed_load_;