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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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
« chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm ('K') | « content/browser/accessibility/browser_accessibility_mac_unittest.mm ('k') | content/browser/geolocation/core_location_data_provider_mac.h » ('j') | content/browser/renderer_host/webmenurunner_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
index 5d1be270d212e5a5efeab3cdc4b66205c0450fef..e63722736f2eac2730172bd48307a35a9221ae73 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
@@ -5,14 +5,14 @@
#include "content/browser/gamepad/gamepad_platform_data_fetcher_mac.h"
#include "base/mac/foundation_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include <IOKit/hid/IOHIDKeys.h>
#import <Foundation/Foundation.h>
+#include <IOKit/hid/IOHIDKeys.h>
using WebKit::WebGamepad;
using WebKit::WebGamepads;
@@ -60,7 +60,7 @@ GamepadPlatformDataFetcherMac::GamepadPlatformDataFetcherMac()
return;
}
- scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
+ base::scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
DeviceMatching(kGenericDesktopUsagePage, kJoystickUsageNumber),
DeviceMatching(kGenericDesktopUsagePage, kGameUsageNumber),
DeviceMatching(kGenericDesktopUsagePage, kMultiAxisUsageNumber),
« chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm ('K') | « content/browser/accessibility/browser_accessibility_mac_unittest.mm ('k') | content/browser/geolocation/core_location_data_provider_mac.h » ('j') | content/browser/renderer_host/webmenurunner_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698