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

Unified Diff: chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm

Issue 3828009: Move scoped_nsdisable_screen_update from base to app/mac... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 2 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/dom_ui/options/advanced_options_utils_mac.mm ('k') | chrome/browser/platform_util_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm
===================================================================
--- chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm (revision 62899)
+++ chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm (working copy)
@@ -9,7 +9,7 @@
#include <dlfcn.h>
#import <Foundation/Foundation.h>
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/scoped_nsobject.h"
#include "base/sys_string_conversions.h"
@@ -66,7 +66,7 @@
// auto release pool. It's simplest to do this as an automatic variable in
// each method that needs it, to ensure the scoping is correct and does not
// interfere with any other code using autorelease pools on the thread.
- base::ScopedNSAutoreleasePool auto_pool;
+ base::mac::ScopedNSAutoreleasePool auto_pool;
bundle_.reset([[NSBundle alloc]
initWithPath:@"/System/Library/Frameworks/CoreWLAN.framework"]);
if (!bundle_) {
@@ -98,7 +98,7 @@
}
bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
- base::ScopedNSAutoreleasePool auto_pool;
+ base::mac::ScopedNSAutoreleasePool auto_pool;
// Initialize the scan parameters with scan key merging disabled, so we get
// every AP listed in the scan without any SSID de-duping logic.
NSDictionary* params =
« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_utils_mac.mm ('k') | chrome/browser/platform_util_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698