chromium/src
0
Fork 0
Code Activity

On .mm files in net and base:

Browse Source 
- Update the license boilerplate
 - Set svn:eol-style properly
 - Get rid of trailing whitespace

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1455 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
mmentovai@google.com
2008-08-27 19:03:43 +00:00
parent 50dc3d38b5
commit 49df6028b6
6 changed files with 42 additions and 195 deletions

31
base/base_paths_mac.mm

@@ -1,31 +1,6 @@
// Copyright 2008, Google Inc. // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// All rights reserved. // Use of this source code is governed by a BSD-style license that can be
// // found in the LICENSE file.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "base/base_paths_mac.h" #include "base/base_paths_mac.h"

68
base/clipboard_mac.mm

@@ -1,31 +1,6 @@
// Copyright 2008, Google Inc. // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// All rights reserved. // Use of this source code is governed by a BSD-style license that can be
// // found in the LICENSE file.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "base/clipboard.h" #include "base/clipboard.h"
@@ -44,7 +19,7 @@ NSString* nsStringForWString(const std::wstring& string) {
return [NSString stringWithCharacters:text16.c_str() length:text16.length()]; return [NSString stringWithCharacters:text16.c_str() length:text16.length()];
} }
} } // namespace
Clipboard::Clipboard() { Clipboard::Clipboard() {
} }
@@ -61,7 +36,6 @@ void Clipboard::WriteText(const std::wstring& text) {
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
[pb declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; [pb declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
[pb setString:nsStringForWString(text) forType:NSStringPboardType]; [pb setString:nsStringForWString(text) forType:NSStringPboardType];
} }
void Clipboard::WriteHTML(const std::wstring& markup, void Clipboard::WriteHTML(const std::wstring& markup,
@@ -82,7 +56,7 @@ void Clipboard::WriteHyperlink(const std::wstring& title,
NSURL* nsurl = [NSURL URLWithString: NSURL* nsurl = [NSURL URLWithString:
[NSString stringWithUTF8String:url.c_str()]]; [NSString stringWithUTF8String:url.c_str()]];
NSString* nstitle = nsStringForWString(title); NSString* nstitle = nsStringForWString(title);
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
// passing UTIs into the pasteboard methods is valid >= 10.5 // passing UTIs into the pasteboard methods is valid >= 10.5
[pb declareTypes:[NSArray arrayWithObjects:NSURLPboardType, [pb declareTypes:[NSArray arrayWithObjects:NSURLPboardType,
@@ -103,7 +77,7 @@ void Clipboard::WriteFiles(const std::vector<std::wstring>& files) {
for (unsigned int i = 0; i < files.size(); ++i) { for (unsigned int i = 0; i < files.size(); ++i) {
[fileList addObject:nsStringForWString(files[i])]; [fileList addObject:nsStringForWString(files[i])];
} }
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
[pb declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; [pb declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil];
[pb setPropertyList:fileList forType:NSFilenamesPboardType]; [pb setPropertyList:fileList forType:NSFilenamesPboardType];
@@ -112,14 +86,14 @@ void Clipboard::WriteFiles(const std::vector<std::wstring>& files) {
bool Clipboard::IsFormatAvailable(NSString* format) const { bool Clipboard::IsFormatAvailable(NSString* format) const {
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
NSArray* types = [pb types]; NSArray* types = [pb types];
return [types containsObject:format]; return [types containsObject:format];
} }
void Clipboard::ReadText(std::wstring* result) const { void Clipboard::ReadText(std::wstring* result) const {
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
NSString* contents = [pb stringForType:NSStringPboardType]; NSString* contents = [pb stringForType:NSStringPboardType];
UTF8ToWide([contents UTF8String], UTF8ToWide([contents UTF8String],
[contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding], [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
result); result);
@@ -128,42 +102,42 @@ void Clipboard::ReadText(std::wstring* result) const {
void Clipboard::ReadAsciiText(std::string* result) const { void Clipboard::ReadAsciiText(std::string* result) const {
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
NSString* contents = [pb stringForType:NSStringPboardType]; NSString* contents = [pb stringForType:NSStringPboardType];
*result = std::string([contents UTF8String]); *result = std::string([contents UTF8String]);
} }
void Clipboard::ReadHTML(std::wstring* markup, std::string* src_url) const { void Clipboard::ReadHTML(std::wstring* markup, std::string* src_url) const {
if (markup) { if (markup) {
markup->clear(); markup->clear();
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
NSString* contents = [pb stringForType:NSStringPboardType]; NSString* contents = [pb stringForType:NSStringPboardType];
UTF8ToWide([contents UTF8String], UTF8ToWide([contents UTF8String],
[contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding], [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
markup); markup);
} }
// TODO(avi): src_url? // TODO(avi): src_url?
if (src_url) if (src_url)
src_url->clear(); src_url->clear();
} }
void Clipboard::ReadBookmark(std::wstring* title, std::string* url) const { void Clipboard::ReadBookmark(std::wstring* title, std::string* url) const {
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
if (title) { if (title) {
title->clear(); title->clear();
NSString* contents = [pb stringForType:kUTTypeURLName]; NSString* contents = [pb stringForType:kUTTypeURLName];
UTF8ToWide([contents UTF8String], UTF8ToWide([contents UTF8String],
[contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding], [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
title); title);
} }
if (url) { if (url) {
url->clear(); url->clear();
NSURL* nsurl = [NSURL URLFromPasteboard:pb]; NSURL* nsurl = [NSURL URLFromPasteboard:pb];
*url = std::string([[nsurl absoluteString] UTF8String]); *url = std::string([[nsurl absoluteString] UTF8String]);
} }
@@ -174,11 +148,11 @@ void Clipboard::ReadFile(std::wstring* file) const {
NOTREACHED(); NOTREACHED();
return; return;
} }
file->clear(); file->clear();
std::vector<std::wstring> files; std::vector<std::wstring> files;
ReadFiles(&files); ReadFiles(&files);
// Take the first file, if available. // Take the first file, if available.
if (!files.empty()) if (!files.empty())
file->assign(files[0]); file->assign(files[0]);
@@ -189,12 +163,12 @@ void Clipboard::ReadFiles(std::vector<std::wstring>* files) const {
NOTREACHED(); NOTREACHED();
return; return;
} }
files->clear(); files->clear();
NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSPasteboard* pb = [NSPasteboard generalPasteboard];
NSArray* fileList = [pb propertyListForType:NSFilenamesPboardType]; NSArray* fileList = [pb propertyListForType:NSFilenamesPboardType];
for (unsigned int i = 0; i < [fileList count]; ++i) { for (unsigned int i = 0; i < [fileList count]; ++i) {
std::wstring file = UTF8ToWide([[fileList objectAtIndex:i] UTF8String]); std::wstring file = UTF8ToWide([[fileList objectAtIndex:i] UTF8String]);
files->push_back(file); files->push_back(file);

37
base/file_util_mac.mm

@@ -1,31 +1,6 @@
// Copyright 2008, Google Inc. // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// All rights reserved. // Use of this source code is governed by a BSD-style license that can be
// // found in the LICENSE file.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "base/file_util.h" #include "base/file_util.h"
@@ -47,10 +22,10 @@ bool GetTempDir(std::wstring* path) {
[tmp cStringUsingEncoding:NSUTF32StringEncoding]); [tmp cStringUsingEncoding:NSUTF32StringEncoding]);
return true; return true;
} }
bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) { bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) {
return (copyfile(WideToUTF8(from_path).c_str(), return (copyfile(WideToUTF8(from_path).c_str(),
WideToUTF8(to_path).c_str(), NULL, COPYFILE_ALL) == 0); WideToUTF8(to_path).c_str(), NULL, COPYFILE_ALL) == 0);
} }
} // namespace } // namespace

33
base/file_version_info_mac.mm

@@ -1,32 +1,6 @@
// Copyright 2008, Google Inc. // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// All rights reserved. // Use of this source code is governed by a BSD-style license that can be
// // found in the LICENSE file.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Copied from base/basictypes.h with some modifications
#include "base/file_version_info.h" #include "base/file_version_info.h"
@@ -146,4 +120,3 @@ std::wstring FileVersionInfo::GetStringValue(const wchar_t* name) {
return str; return str;
return L""; return L"";
} }

31
base/platform_test_mac.mm

@@ -1,31 +1,6 @@
// Copyright 2008, Google Inc. // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// All rights reserved. // Use of this source code is governed by a BSD-style license that can be
// // found in the LICENSE file.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "base/platform_test.h" #include "base/platform_test.h"

37
net/base/platform_mime_util_mac.mm

@@ -1,31 +1,6 @@
// Copyright 2008, Google Inc. // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// All rights reserved. // Use of this source code is governed by a BSD-style license that can be
// // found in the LICENSE file.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <string> #include <string>
@@ -54,7 +29,7 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)); UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType));
if (!mime_ref) if (!mime_ref)
return false; return false;
*result = base::SysCFStringRefToUTF8(mime_ref); *result = base::SysCFStringRefToUTF8(mime_ref);
return true; return true;
} }
@@ -74,12 +49,12 @@ bool PlatformMimeUtil::GetPreferredExtensionForMimeType(
UTTypeCopyPreferredTagWithClass(uti, kUTTagClassFilenameExtension)); UTTypeCopyPreferredTagWithClass(uti, kUTTagClassFilenameExtension));
if (!ext_ref) if (!ext_ref)
return false; return false;
ext_ref.reset(CFStringCreateWithFormat(kCFAllocatorDefault, ext_ref.reset(CFStringCreateWithFormat(kCFAllocatorDefault,
NULL, NULL,
CFSTR(".%@"), CFSTR(".%@"),
ext_ref.get())); ext_ref.get()));
*ext = base::SysCFStringRefToWide(ext_ref); *ext = base::SysCFStringRefToWide(ext_ref);
return true; return true;
} }