chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc - Issue 12212038: Do not pass NULL to GetAsString().

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/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

Issue 12212038: Do not pass NULL to GetAsString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

index 01a4a713fbe7f2a70ae3d940f01457fa43907016..7f42aeb8d2ca343c1ae9468687b8b036ef1b694d 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

@@ -197,8 +197,9 @@ std::string GetPrefForRootWindow(PrefService* pref_service,

for (base::DictionaryValue::Iterator iter(*shelf_prefs);

!iter.IsAtEnd(); iter.Advance()) {

const base::DictionaryValue* display_pref = NULL;

+ std::string unused_value;

if (iter.value().GetAsDictionary(&display_pref) &&

- display_pref->GetString(path, static_cast<std::string*>(NULL))) {

+ display_pref->GetString(path, &unused_value)) {

has_per_display_prefs = true;

break;

}