| 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),
|
|
|