diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
| commit | df0ca6c858762b101bf424ff6c0522409fa195fc (patch) | |
| tree | efa188eee6972e2c0de358f2d19a2348ce6dcb06 /chrome/browser/search_engines | |
| parent | 73de26a684944782a92f8e6840e1b290c9a424cd (diff) | |
| download | chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.zip chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.gz chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.bz2 | |
Move scoped_cftyperef from base to base/mac, use the new namespace, and name it
properly (scoped_cftyperef -> ScopedCFTypeRef).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3855001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_prepopulate_data.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index b8b7361..362f95b 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -23,7 +23,7 @@ #if defined(OS_WIN) #undef IN // On Windows, windef.h defines this, which screws up "India" cases. #elif defined(OS_MACOSX) -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #endif using base::Time; @@ -2863,7 +2863,7 @@ int GetCurrentCountryID() { #elif defined(OS_MACOSX) int GetCurrentCountryID() { - scoped_cftyperef<CFLocaleRef> locale(CFLocaleCopyCurrent()); + base::mac::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent()); CFStringRef country = (CFStringRef)CFLocaleGetValue(locale.get(), kCFLocaleCountryCode); if (!country) |