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

Unified Diff: net/proxy/proxy_config_service_mac.cc

Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 12 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 | « gfx/test_suite.h ('k') | net/proxy/proxy_resolver_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_mac.cc
===================================================================
--- net/proxy/proxy_config_service_mac.cc (revision 70358)
+++ net/proxy/proxy_config_service_mac.cc (working copy)
@@ -8,7 +8,7 @@
#include <SystemConfiguration/SystemConfiguration.h>
#include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/sys_string_conversions.h"
#include "net/base/net_errors.h"
@@ -27,7 +27,7 @@
bool GetBoolFromDictionary(CFDictionaryRef dict,
CFStringRef key,
bool default_value) {
- CFNumberRef number = (CFNumberRef)mac_util::GetValueFromDictionary(
+ CFNumberRef number = (CFNumberRef)base::mac::GetValueFromDictionary(
dict, key, CFNumberGetTypeID());
if (!number)
return default_value;
@@ -59,7 +59,7 @@
if (GetBoolFromDictionary(config_dict.get(),
kSCPropNetProxiesProxyAutoConfigEnable,
false)) {
- CFStringRef pac_url_ref = (CFStringRef)mac_util::GetValueFromDictionary(
+ CFStringRef pac_url_ref = (CFStringRef)base::mac::GetValueFromDictionary(
config_dict.get(),
kSCPropNetProxiesProxyAutoConfigURLString,
CFStringGetTypeID());
@@ -129,7 +129,7 @@
// proxy bypass list
CFArrayRef bypass_array_ref =
- (CFArrayRef)mac_util::GetValueFromDictionary(
+ (CFArrayRef)base::mac::GetValueFromDictionary(
config_dict.get(),
kSCPropNetProxiesExceptionsList,
CFArrayGetTypeID());
« no previous file with comments | « gfx/test_suite.h ('k') | net/proxy/proxy_resolver_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698