diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 05:33:12 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 05:33:12 +0000 |
| commit | 266a84c13176060709c1a65ef135ea9ac5b8fa00 (patch) | |
| tree | 32b32266f7f414928c87eb2680ccfef38762d5a2 /ui | |
| parent | 917a8f1e651709ea76fdd819ba818c23bddc7ba2 (diff) | |
| download | chromium_src-266a84c13176060709c1a65ef135ea9ac5b8fa00.zip chromium_src-266a84c13176060709c1a65ef135ea9ac5b8fa00.tar.gz chromium_src-266a84c13176060709c1a65ef135ea9ac5b8fa00.tar.bz2 | |
mac: Remove 9 exit time destructors.
BUG=101600
TEST=none
Review URL: http://codereview.chromium.org/8455007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/clipboard/clipboard_mac.mm | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index e1ffc81..cab0616 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -336,59 +336,47 @@ uint64 Clipboard::GetSequenceNumber() { // static Clipboard::FormatType Clipboard::GetUrlFormatType() { - static const std::string type = base::SysNSStringToUTF8(NSURLPboardType); - return type; + return base::SysNSStringToUTF8(NSURLPboardType); } // static Clipboard::FormatType Clipboard::GetUrlWFormatType() { - static const std::string type = base::SysNSStringToUTF8(NSURLPboardType); - return type; + return base::SysNSStringToUTF8(NSURLPboardType); } // static Clipboard::FormatType Clipboard::GetPlainTextFormatType() { - static const std::string type = base::SysNSStringToUTF8(NSStringPboardType); - return type; + return base::SysNSStringToUTF8(NSStringPboardType); } // static Clipboard::FormatType Clipboard::GetPlainTextWFormatType() { - static const std::string type = base::SysNSStringToUTF8(NSStringPboardType); - return type; + return base::SysNSStringToUTF8(NSStringPboardType); } // static Clipboard::FormatType Clipboard::GetFilenameFormatType() { - static const std::string type = - base::SysNSStringToUTF8(NSFilenamesPboardType); - return type; + return base::SysNSStringToUTF8(NSFilenamesPboardType); } // static Clipboard::FormatType Clipboard::GetFilenameWFormatType() { - static const std::string type = - base::SysNSStringToUTF8(NSFilenamesPboardType); - return type; + return base::SysNSStringToUTF8(NSFilenamesPboardType); } // static Clipboard::FormatType Clipboard::GetHtmlFormatType() { - static const std::string type = base::SysNSStringToUTF8(NSHTMLPboardType); - return type; + return base::SysNSStringToUTF8(NSHTMLPboardType); } // static Clipboard::FormatType Clipboard::GetBitmapFormatType() { - static const std::string type = base::SysNSStringToUTF8(NSTIFFPboardType); - return type; + return base::SysNSStringToUTF8(NSTIFFPboardType); } // static Clipboard::FormatType Clipboard::GetWebKitSmartPasteFormatType() { - static const std::string type = - base::SysNSStringToUTF8(kWebSmartPastePboardType); - return type; + return base::SysNSStringToUTF8(kWebSmartPastePboardType); } } // namespace ui |