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

Side by Side Diff: ui/base/clipboard/clipboard_aurax11.cc

Issue 11225021: Move flash clipboard to the new proxy and add custom format support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/clipboard/clipboard_android.cc ('k') | ui/base/clipboard/clipboard_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/clipboard/clipboard.h" 5 #include "ui/base/clipboard/clipboard.h"
6 6
7 #include <X11/extensions/Xfixes.h> 7 #include <X11/extensions/Xfixes.h>
8 #include <X11/Xatom.h> 8 #include <X11/Xatom.h>
9 #include <list> 9 #include <list>
10 #include <set> 10 #include <set>
(...skipping 18 matching lines...) Expand all
29 29
30 namespace ui { 30 namespace ui {
31 31
32 namespace { 32 namespace {
33 33
34 const char kChromeSelection[] = "CHROME_SELECTION"; 34 const char kChromeSelection[] = "CHROME_SELECTION";
35 const char kClipboard[] = "CLIPBOARD"; 35 const char kClipboard[] = "CLIPBOARD";
36 const char kMimeTypeBitmap[] = "image/bmp"; 36 const char kMimeTypeBitmap[] = "image/bmp";
37 const char kMimeTypeFilename[] = "chromium/filename"; 37 const char kMimeTypeFilename[] = "chromium/filename";
38 const char kMimeTypeMozillaURL[] = "text/x-moz-url"; 38 const char kMimeTypeMozillaURL[] = "text/x-moz-url";
39 const char kMimeTypePepperCustomData[] = "chromium/x-pepper-custom-data";
39 const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste"; 40 const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";
40 const char kMultiple[] = "MULTIPLE"; 41 const char kMultiple[] = "MULTIPLE";
41 const char kString[] = "STRING"; 42 const char kString[] = "STRING";
42 const char kTargets[] = "TARGETS"; 43 const char kTargets[] = "TARGETS";
43 const char kText[] = "TEXT"; 44 const char kText[] = "TEXT";
44 const char kUtf8String[] = "UTF8_STRING"; 45 const char kUtf8String[] = "UTF8_STRING";
45 46
46 const char* kAtomsToCache[] = { 47 const char* kAtomsToCache[] = {
47 kChromeSelection, 48 kChromeSelection,
48 kClipboard, 49 kClipboard,
(...skipping 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebkitSmartPaste)); 1201 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebkitSmartPaste));
1201 return type; 1202 return type;
1202 } 1203 }
1203 1204
1204 // static 1205 // static
1205 const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() { 1206 const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() {
1206 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomData)); 1207 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomData));
1207 return type; 1208 return type;
1208 } 1209 }
1209 1210
1211 // static
1212 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
1213 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
1214 return type;
1215 }
1216
1210 } // namespace ui 1217 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/clipboard/clipboard_android.cc ('k') | ui/base/clipboard/clipboard_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698