chrome/browser/search_engines/template_url_prepopulate_data.cc - Issue 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

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 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 10 years, 2 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: chrome/browser/search_engines/template_url_prepopulate_data.cc

===================================================================

--- chrome/browser/search_engines/template_url_prepopulate_data.cc (revision 62861)

+++ chrome/browser/search_engines/template_url_prepopulate_data.cc (working copy)

@@ -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 @@

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

« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_mac.mm ('k') | chrome/common/font_loader_mac.mm » ('j') | no next file with comments »