| OLD | NEW |
| 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 Loading... |
| 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 |
| OLD | NEW |