Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc |
index 9248cce055095eb6a19ea7a12ce3e806ff6b1118..b5155db9772b9b97e8e5afd0edc21d834cff04da 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc |
@@ -135,11 +135,12 @@ std::string GetPrefForRootWindow(PrefService* pref_service, |
// If the pref for the specified display is not found, scan the whole prefs |
// and check if the prefs for other display is already specified. |
+ std::string unused_value; |
for (base::DictionaryValue::Iterator iter(*shelf_prefs); |
!iter.IsAtEnd(); iter.Advance()) { |
const base::DictionaryValue* display_pref = NULL; |
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; |
} |