summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_resizer_mac.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-24 18:49:05 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-24 18:49:05 +0000
commit3df79f4277938356ae3c7b3ecc25ab6165e8a899 (patch)
treea1a39cd236c8800a13f2f3bf879d69505a2508de /remoting/host/desktop_resizer_mac.cc
parent8a15ea13737ae2f8444424fc14d1fcd5e42d5218 (diff)
downloadchromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.zip
chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.gz
chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.bz2
mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.
This CL was created fully mechanically by running git grep -l base::mac::ScopedCFTypeRef | xargs sed -i -e 's/base::mac::ScopedCFTypeRef/base::ScopedCFTypeRef/g' git commit -a -m. git clang-format HEAD^ --style=Chromium git commit -a -m. git cl upload -t $TITLE BUG=251957 TBR=mark@chromium.org Review URL: https://codereview.chromium.org/16917011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_resizer_mac.cc')
-rw-r--r--remoting/host/desktop_resizer_mac.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/remoting/host/desktop_resizer_mac.cc b/remoting/host/desktop_resizer_mac.cc
index d1d6c2c..22cc67e 100644
--- a/remoting/host/desktop_resizer_mac.cc
+++ b/remoting/host/desktop_resizer_mac.cc
@@ -31,7 +31,7 @@ class DesktopResizerMac : public DesktopResizer {
bool GetSoleDisplayId(CGDirectDisplayID* display);
void GetSupportedModesAndSizes(
- base::mac::ScopedCFTypeRef<CFMutableArrayRef>* modes,
+ base::ScopedCFTypeRef<CFMutableArrayRef>* modes,
std::list<SkISize>* sizes);
DISALLOW_COPY_AND_ASSIGN(DesktopResizerMac);
@@ -50,7 +50,7 @@ SkISize DesktopResizerMac::GetCurrentSize() {
std::list<SkISize> DesktopResizerMac::GetSupportedSizes(
const SkISize& preferred) {
- base::mac::ScopedCFTypeRef<CFMutableArrayRef> modes;
+ base::ScopedCFTypeRef<CFMutableArrayRef> modes;
std::list<SkISize> sizes;
GetSupportedModesAndSizes(&modes, &sizes);
return sizes;
@@ -62,7 +62,7 @@ void DesktopResizerMac::SetSize(const SkISize& size) {
return;
}
- base::mac::ScopedCFTypeRef<CFMutableArrayRef> modes;
+ base::ScopedCFTypeRef<CFMutableArrayRef> modes;
std::list<SkISize> sizes;
GetSupportedModesAndSizes(&modes, &sizes);
// There may be many modes with the requested size. Pick the one with the
@@ -76,7 +76,7 @@ void DesktopResizerMac::SetSize(const SkISize& size) {
static_cast<const CGDisplayMode*>(
CFArrayGetValueAtIndex(modes, index)));
int depth = 0;
- base::mac::ScopedCFTypeRef<CFStringRef> encoding(
+ base::ScopedCFTypeRef<CFStringRef> encoding(
CGDisplayModeCopyPixelEncoding(mode));
if (CFStringCompare(encoding, CFSTR(IO32BitDirectPixels),
kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
@@ -108,12 +108,12 @@ void DesktopResizerMac::RestoreSize(const SkISize& original) {
}
void DesktopResizerMac::GetSupportedModesAndSizes(
- base::mac::ScopedCFTypeRef<CFMutableArrayRef>* modes,
+ base::ScopedCFTypeRef<CFMutableArrayRef>* modes,
std::list<SkISize>* sizes) {
CGDirectDisplayID display;
if (GetSoleDisplayId(&display)) {
- base::mac::ScopedCFTypeRef<CFArrayRef>
- all_modes(CGDisplayCopyAllDisplayModes(display, NULL));
+ base::ScopedCFTypeRef<CFArrayRef> all_modes(
+ CGDisplayCopyAllDisplayModes(display, NULL));
modes->reset(CFArrayCreateMutableCopy(NULL, 0, all_modes));
CFIndex count = CFArrayGetCount(*modes);
for (CFIndex i = 0; i < count; ++i) {