Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "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/pickle.h" | 8 #include "base/pickle.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 251 } | 251 } |
| 252 } | 252 } |
| 253 | 253 |
| 254 bool WebClipboardImpl::ConvertBufferType(Buffer buffer, | 254 bool WebClipboardImpl::ConvertBufferType(Buffer buffer, |
| 255 ui::Clipboard::Buffer* result) { | 255 ui::Clipboard::Buffer* result) { |
| 256 switch (buffer) { | 256 switch (buffer) { |
| 257 case BufferStandard: | 257 case BufferStandard: |
| 258 *result = ui::Clipboard::BUFFER_STANDARD; | 258 *result = ui::Clipboard::BUFFER_STANDARD; |
| 259 break; | 259 break; |
| 260 case BufferSelection: | 260 case BufferSelection: |
| 261 #if defined(USE_X11) && !defined(USE_AURA) | 261 #if defined(USE_X11) |
| 262 #if defined(USE_AURA) | |
|
oshima
2012/08/10 19:47:08
this should be USE_ASH , or OS_CHROMEOS
Linux aur
sschmitz
2012/08/10 20:18:27
Changed USE_AURA to OS_CHROMEOS
Done.
| |
| 263 return false; | |
| 264 #else | |
| 262 *result = ui::Clipboard::BUFFER_SELECTION; | 265 *result = ui::Clipboard::BUFFER_SELECTION; |
| 263 break; | 266 break; |
| 264 #endif | 267 #endif |
| 268 #endif | |
| 265 default: | 269 default: |
| 266 NOTREACHED(); | 270 NOTREACHED(); |
| 267 return false; | 271 return false; |
| 268 } | 272 } |
| 269 return true; | 273 return true; |
| 270 } | 274 } |
| 271 | 275 |
| 272 } // namespace webkit_glue | 276 } // namespace webkit_glue |
| OLD | NEW |