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

Unified Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 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 | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 11a211fa7b2dece612a28152f7a3705e1f34be08..4de27d4fd55fa7fbde1af8979694dd0018b3389f 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -52,8 +52,8 @@
#include "net/url_request/url_request.h"
#if defined(OS_CHROMEOS)
-#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
+#include "base/sys_info.h"
#include "chrome/common/chrome_switches.h"
#endif
@@ -641,7 +641,7 @@ bool ChromeNetworkDelegate::OnCanAccessFile(const net::URLRequest& request,
#if defined(OS_CHROMEOS)
// If we're running Chrome for ChromeOS on Linux, we want to allow file
// access.
- if (!base::chromeos::IsRunningOnChromeOS() ||
+ if (!base::SysInfo::IsRunningOnChromeOS() ||
CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
return true;
}
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698