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

Unified Diff: webkit/common/user_agent/user_agent_util_ios.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
Index: webkit/common/user_agent/user_agent_util_ios.mm
diff --git a/webkit/common/user_agent/user_agent_util_ios.mm b/webkit/common/user_agent/user_agent_util_ios.mm
index 3c80babc8a9cbde6c07917411dbb60e2d83fd0be..a5f27061ab09b705a5b4b4a49b1c22f0856b121a 100644
--- a/webkit/common/user_agent/user_agent_util_ios.mm
+++ b/webkit/common/user_agent/user_agent_util_ios.mm
@@ -9,7 +9,7 @@
#include <sys/sysctl.h>
#include <string>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
@@ -110,7 +110,7 @@ std::string BuildOSCpuInfo() {
// objectForKey:NSLocaleLanguageCode and objectForKey:NSLocaleCountryCode)
// are not useful here because they return information related to the
// "Region Format" setting, which is different from the "Language" setting.
- scoped_nsobject<NSDictionary> dialects([[NSDictionary alloc]
+ base::scoped_nsobject<NSDictionary> dialects([[NSDictionary alloc]
initWithObjectsAndKeys:
Nico 2013/06/25 01:09:50 Also PR16435 and PR16436
@"ar", @"ar", // No dialect code in Safari.
@"ca-es", @"ca",
« ui/message_center/cocoa/tray_controller.mm ('K') | « webkit/common/cursors/webcursor_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698