chrome/browser/profile_resetter/resettable_settings_snapshot.h - Issue 599463002: Use base::StringPairs where appropriate from src/chrome/browser

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: chrome/browser/profile_resetter/resettable_settings_snapshot.h

Issue 599463002: Use base::StringPairs where appropriate from src/chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixing nit Created 6 years, 3 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 | « chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/resettable_settings_snapshot.h

diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.h b/chrome/browser/profile_resetter/resettable_settings_snapshot.h

index 04b4541eb77dbfdf4bbd836e3ba0635b9d0a684e..2022e97425dc94d744cbe0d89ed8a7efd6330efd 100644

--- a/chrome/browser/profile_resetter/resettable_settings_snapshot.h

+++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.h

@@ -12,6 +12,7 @@

#include "base/basictypes.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

+#include "base/strings/string_split.h"

#include "chrome/browser/prefs/session_startup_pref.h"

#include "chrome/browser/profile_resetter/profile_resetter.h"

@@ -25,7 +26,7 @@ class ResettableSettingsSnapshot {

public:

// ExtensionList is a vector of pairs. The first component is the extension

// id, the second is the name.

- typedef std::vector<std::pair<std::string, std::string> > ExtensionList;

+ typedef base::StringPairs ExtensionList;

// All types of settings handled by this class.

enum Field {

STARTUP_MODE = 1 << 0,