summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorers@chromium.org <ers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 05:58:03 +0000
committerers@chromium.org <ers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 05:58:03 +0000
commitf23f3a78ea230acda0905adcf7426ffb23c1b5c8 (patch)
tree45b540ccc080ee630af387482ef102b1d6a8318e
parente905c86be9a28558e4e165bcf501d20010771e80 (diff)
downloadchromium_src-f23f3a78ea230acda0905adcf7426ffb23c1b5c8.zip
chromium_src-f23f3a78ea230acda0905adcf7426ffb23c1b5c8.tar.gz
chromium_src-f23f3a78ea230acda0905adcf7426ffb23c1b5c8.tar.bz2
Merge 84931 - Fix compiler warning.
BUG=chromium-os:14180 TEST=it compiles without warning Review URL: http://codereview.chromium.org/7000020 TBR=ers@chromium.org Review URL: http://codereview.chromium.org/7001023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84938 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/cros/network_library.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index ea48d75..e3385e02 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -2107,12 +2107,12 @@ class NetworkLibraryImpl : public NetworkLibrary {
NetworkDeviceObserverList* oblist;
if (iter != network_device_observers_.end()) {
oblist = iter->second;
+ if (!oblist->HasObserver(observer))
+ oblist->AddObserver(observer);
} else {
LOG(WARNING) << "No NetworkDeviceObserverList found for "
<< device_path;
}
- if (!oblist->HasObserver(observer))
- oblist->AddObserver(observer);
}
virtual void RemoveNetworkDeviceObserver(const std::string& device_path,