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

Side by Side Diff: webkit/glue/webclipboard_impl.cc

Issue 8540031: Disable selection on aura. Clipboard semantics on aura must be same as windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 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.h ('k') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/glue/webclipboard_impl.h" 5 #include "webkit/glue/webclipboard_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } 220 }
221 } 221 }
222 222
223 bool WebClipboardImpl::ConvertBufferType(Buffer buffer, 223 bool WebClipboardImpl::ConvertBufferType(Buffer buffer,
224 ui::Clipboard::Buffer* result) { 224 ui::Clipboard::Buffer* result) {
225 switch (buffer) { 225 switch (buffer) {
226 case BufferStandard: 226 case BufferStandard:
227 *result = ui::Clipboard::BUFFER_STANDARD; 227 *result = ui::Clipboard::BUFFER_STANDARD;
228 break; 228 break;
229 case BufferSelection: 229 case BufferSelection:
230 #if defined(USE_X11) 230 #if defined(USE_X11) && !defined(USE_AURA)
231 *result = ui::Clipboard::BUFFER_SELECTION; 231 *result = ui::Clipboard::BUFFER_SELECTION;
232 break; 232 break;
233 #endif 233 #endif
234 default: 234 default:
235 NOTREACHED(); 235 NOTREACHED();
236 return false; 236 return false;
237 } 237 }
238 return true; 238 return true;
239 } 239 }
240 240
241 } // namespace webkit_glue 241 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « ui/base/clipboard/clipboard.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698