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

Unified Diff: net/base/network_change_notifier.cc

Issue 223143006: Make necessary changes for chromecast build as chromecast has it own implementation of NetworkChang… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a check failure when we don't yet have a NetworkChangeNotifierFactory for chromecast build Created 6 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 | net/net.gyp » ('j') | net/proxy/proxy_service.cc » ('J')
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 638964a25d29ad12016b9d20ad64cf82df7ef222..3c4a8fa6c97c3113cc7d3f300299209c8eae2b1e 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -16,7 +16,7 @@
#if defined(OS_WIN)
#include "net/base/network_change_notifier_win.h"
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(CHROMECAST_BUILD)
darin (slow to review) 2014/04/14 05:03:29 is it actually problematic to include this header?
lcwu1 2014/04/15 06:24:42 No, it doesn't cause any problem if we include the
#include "net/base/network_change_notifier_linux.h"
#elif defined(OS_MACOSX)
#include "net/base/network_change_notifier_mac.h"
@@ -486,7 +486,7 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() {
network_change_notifier->WatchForAddressChange();
return network_change_notifier;
#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
- // ChromeOS and Android builds MUST use their own class factory.
+ // ChromeOS, Android, and Chromecast builds MUST use their own class factory.
Ryan Sleevi 2014/04/14 21:28:43 This comment doesn't seem like it should be update
lcwu1 2014/04/15 06:24:42 Yes, this comment only makes sense in patch set 2.
#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
@@ -494,6 +494,8 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() {
CHECK(false);
#endif
return NULL;
+#elif defined(CHROMECAST_BUILD)
darin (slow to review) 2014/04/14 04:48:00 The comment that Chromecast MUST use its own class
Ryan Sleevi 2014/04/14 21:28:43 Apologies that I wasn't clearer, this is what I wa
lcwu1 2014/04/15 06:24:42 Yes, agreed. The reason why I didn't have a CHECK
+ return NULL;
#elif defined(OS_LINUX)
return NetworkChangeNotifierLinux::Create();
#elif defined(OS_MACOSX)
« no previous file with comments | « no previous file | net/net.gyp » ('j') | net/proxy/proxy_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698