chrome/browser/chromeos/display/display_preferences.cc - Issue 1240183002: Update SplitString calls in chrome.

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/chromeos/display/display_preferences.cc

Issue 1240183002: Update SplitString calls in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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:

Index: chrome/browser/chromeos/display/display_preferences.cc

diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc

index b04601383a64d6a2c4e83a439be466bd6e388b5e..8d0dea9d5d680aa89eb2bae7b8feb19d45ce0306 100644

--- a/chrome/browser/chromeos/display/display_preferences.cc

+++ b/chrome/browser/chromeos/display/display_preferences.cc

@@ -121,8 +121,8 @@ void LoadDisplayLayouts() {

}

if (it.key().find(",") != std::string::npos) {

- std::vector<std::string> ids;

- base::SplitString(it.key(), ',', &ids);

+ std::vector<std::string> ids = base::SplitString(

+ it.key(), ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);

int64 id1 = gfx::Display::kInvalidDisplayID;

int64 id2 = gfx::Display::kInvalidDisplayID;

if (!base::StringToInt64(ids[0], &id1) ||