diff options
| author | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:05:28 +0000 |
|---|---|---|
| committer | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:05:28 +0000 |
| commit | 9d2e449f204afbfd3c77dc6393860c79a73a703c (patch) | |
| tree | 1c2e4a0ebc8d5d8ec5eb46c29e61e536c2f571ab /net/android | |
| parent | fa823d1a6463d563798640329ebe32d323f8920f (diff) | |
| download | chromium_src-9d2e449f204afbfd3c77dc6393860c79a73a703c.zip chromium_src-9d2e449f204afbfd3c77dc6393860c79a73a703c.tar.gz chromium_src-9d2e449f204afbfd3c77dc6393860c79a73a703c.tar.bz2 | |
fix duplicated basename network_change_notifier.cc in net target
BUG=126356
TEST=
Review URL: https://chromiumcodereview.appspot.com/10384025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/net_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | net/android/network_change_notifier_android.cc (renamed from net/android/network_change_notifier.cc) | 2 | ||||
| -rw-r--r-- | net/android/network_change_notifier_android.h (renamed from net/android/network_change_notifier.h) | 0 | ||||
| -rw-r--r-- | net/android/network_change_notifier_factory.cc | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc index f17e377..951b1fb 100644 --- a/net/android/net_jni_registrar.cc +++ b/net/android/net_jni_registrar.cc @@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "net/android/network_library.h" -#include "net/android/network_change_notifier.h" +#include "net/android/network_change_notifier_android.h" namespace net { namespace android { diff --git a/net/android/network_change_notifier.cc b/net/android/network_change_notifier_android.cc index 562f3f1..e1cea06 100644 --- a/net/android/network_change_notifier.cc +++ b/net/android/network_change_notifier_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/android/network_change_notifier.h" +#include "net/android/network_change_notifier_android.h" #include "base/logging.h" #include "base/android/jni_android.h" diff --git a/net/android/network_change_notifier.h b/net/android/network_change_notifier_android.h index 5691a00..5691a00 100644 --- a/net/android/network_change_notifier.h +++ b/net/android/network_change_notifier_android.h diff --git a/net/android/network_change_notifier_factory.cc b/net/android/network_change_notifier_factory.cc index 0bff8b0..82d276139 100644 --- a/net/android/network_change_notifier_factory.cc +++ b/net/android/network_change_notifier_factory.cc @@ -4,7 +4,7 @@ #include "net/android/network_change_notifier_factory.h" -#include "net/android/network_change_notifier.h" +#include "net/android/network_change_notifier_android.h" namespace net { namespace android { |