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

Unified Diff: net/base/network_change_notifier.cc

Issue 10068035: Disable CHECK(false) in NetworkChangeNotifier::Create on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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: net/base/network_change_notifier.cc
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index 5e5e18824c6aef101d08c8c0923ed970f7f5cf6d..ec9cae06d79da8f6beac0145b10ff2635e5206e8 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -57,7 +57,12 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() {
return network_change_notifier;
#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
// ChromeOS and Android builds MUST use their own class factory.
+#if !defined(OS_CHROMEOS)
+ // TODO(oshima): ash_shell do not have access to chromeos'es
+ // notifier yet. Re-enable this when chromeos'es notifier moved to
+ // chromeos root directory. crbug.com/119298.
CHECK(false);
+#endif
return NULL;
#elif defined(OS_LINUX)
return NetworkChangeNotifierLinux::Create();
« 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