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

Side by Side Diff: ui/base/clipboard/clipboard.h

Issue 148153016: Fix platform checks in Clipboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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 #ifndef UI_BASE_CLIPBOARD_CLIPBOARD_H_ 5 #ifndef UI_BASE_CLIPBOARD_CLIPBOARD_H_
6 #define UI_BASE_CLIPBOARD_CLIPBOARD_H_ 6 #define UI_BASE_CLIPBOARD_CLIPBOARD_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // CBF_DATA format char array 177 // CBF_DATA format char array
178 // data byte array 178 // data byte array
179 typedef std::vector<char> ObjectMapParam; 179 typedef std::vector<char> ObjectMapParam;
180 typedef std::vector<ObjectMapParam> ObjectMapParams; 180 typedef std::vector<ObjectMapParam> ObjectMapParams;
181 typedef std::map<int /* ObjectType */, ObjectMapParams> ObjectMap; 181 typedef std::map<int /* ObjectType */, ObjectMapParams> ObjectMap;
182 182
183 static bool IsSupportedClipboardType(int32 type) { 183 static bool IsSupportedClipboardType(int32 type) {
184 switch (type) { 184 switch (type) {
185 case CLIPBOARD_TYPE_COPY_PASTE: 185 case CLIPBOARD_TYPE_COPY_PASTE:
186 return true; 186 return true;
187 #if defined(USE_X11) && !defined(OS_CHROMEOS) 187 #if defined(USE_AURA) && (!defined(OS_WIN) && !defined(OS_CHROMEOS))
dcheng 2014/01/28 23:44:18 Hm... Perhaps it'd be clearer to just say what pl
kalyank 2014/01/29 02:10:47 Done.
188 case CLIPBOARD_TYPE_SELECTION: 188 case CLIPBOARD_TYPE_SELECTION:
189 return true; 189 return true;
190 #endif 190 #endif
191 } 191 }
192 return false; 192 return false;
193 } 193 }
194 194
195 static ClipboardType FromInt(int32 type) { 195 static ClipboardType FromInt(int32 type) {
196 return static_cast<ClipboardType>(type); 196 return static_cast<ClipboardType>(type);
197 } 197 }
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 class AuraX11Details; 392 class AuraX11Details;
393 scoped_ptr<AuraX11Details> aurax11_details_; 393 scoped_ptr<AuraX11Details> aurax11_details_;
394 #endif 394 #endif
395 395
396 DISALLOW_COPY_AND_ASSIGN(Clipboard); 396 DISALLOW_COPY_AND_ASSIGN(Clipboard);
397 }; 397 };
398 398
399 } // namespace ui 399 } // namespace ui
400 400
401 #endif // UI_BASE_CLIPBOARD_CLIPBOARD_H_ 401 #endif // UI_BASE_CLIPBOARD_CLIPBOARD_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698