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

Unified Diff: remoting/host/desktop_resizer_mac.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/curtain_mode_mac.cc ('k') | remoting/host/input_injector_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_resizer_mac.cc
diff --git a/remoting/host/desktop_resizer_mac.cc b/remoting/host/desktop_resizer_mac.cc
index d1d6c2c4ded6dcac0886e547d8c590d362da23da..22cc67e2ca49678838aa288e71b981bfa62af691 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) {
« no previous file with comments | « remoting/host/curtain_mode_mac.cc ('k') | remoting/host/input_injector_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698