Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2318)

Unified Diff: chrome/browser/chromeos/cros/network_library_impl_cros.cc

Issue 10960047: Crash fix for daisy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/network_library_impl_cros.cc
diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.cc b/chrome/browser/chromeos/cros/network_library_impl_cros.cc
index 5e1f3c9fc552c08d17cb6a96ec6929a415c53deb..1d106dc1113894f19cb22ef520dac60847c50071 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_cros.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_cros.cc
@@ -1182,6 +1182,11 @@ void NetworkLibraryImplCros::SetIPParametersCallback(
const IPParameterInfo& info,
const std::string& service_path,
const base::DictionaryValue* properties) {
+ // crbug.com/146616 will fix this once we have better
+ // handling of shill errors.
+ if (!properties)
+ return;
+
// Find the properties we're going to set, and minimize the DBus calls below
// by not clearing if it's already cleared, and not setting if it's already
// set to the same value. Also, don't reconnect at the end if nothing changed.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698