chrome/browser/search_engines/template_url_prepopulate_data.cc - Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/search_engines/template_url_prepopulate_data.cc

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: with fixed off-by-1 in git-clang-format 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:

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc

diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc

index 07438a9d2675ecb8dedff0b2fcb4b07a02a5be08..c11718fb59104ebdb76ea2c69baaf1409e9551f1 100644

--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc

+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc

@@ -618,7 +618,7 @@ int GetCurrentCountryID() {

#elif defined(OS_MACOSX)

int GetCurrentCountryID() {

- base::mac::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent());

+ base::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent());

CFStringRef country = (CFStringRef)CFLocaleGetValue(locale.get(),

kCFLocaleCountryCode);

if (!country)