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

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

Issue 9232075: Have ScopedClipboardWriter and Clipboard::WriteObjects take a buffer parameter. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix build error. Created 8 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 | Annotate | Revision Log
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 // This file implements the ScopedClipboardWriter class. Documentation on its 5 // This file implements the ScopedClipboardWriter class. Documentation on its
6 // purpose can be found in our header. Documentation on the format of the 6 // purpose can be found in our header. Documentation on the format of the
7 // parameters for each clipboard target can be found in clipboard.h. 7 // parameters for each clipboard target can be found in clipboard.h.
8 8
9 #include "ui/base/clipboard/scoped_clipboard_writer.h" 9 #include "ui/base/clipboard/scoped_clipboard_writer.h"
10 10
11 #include "base/pickle.h" 11 #include "base/pickle.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "ui/gfx/size.h" 13 #include "ui/gfx/size.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard) 17 ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard,
18 : clipboard_(clipboard) { 18 Clipboard::Buffer buffer)
19 : clipboard_(clipboard),
20 buffer_(buffer) {
19 } 21 }
20 22
21 ScopedClipboardWriter::~ScopedClipboardWriter() { 23 ScopedClipboardWriter::~ScopedClipboardWriter() {
22 if (!objects_.empty() && clipboard_) { 24 if (!objects_.empty() && clipboard_) {
23 clipboard_->WriteObjects(objects_); 25 clipboard_->WriteObjects(buffer_, objects_);
24 if (url_text_.length()) 26 if (buffer_ == Clipboard::BUFFER_STANDARD && url_text_.length())
25 clipboard_->DidWriteURL(url_text_); 27 clipboard_->DidWriteURL(url_text_);
26 } 28 }
27 } 29 }
28 30
29 void ScopedClipboardWriter::WriteText(const string16& text) { 31 void ScopedClipboardWriter::WriteText(const string16& text) {
30 WriteTextOrURL(text, false); 32 WriteTextOrURL(text, false);
31 } 33 }
32 34
33 void ScopedClipboardWriter::WriteURL(const string16& text) { 35 void ScopedClipboardWriter::WriteURL(const string16& text) {
34 WriteTextOrURL(text, true); 36 WriteTextOrURL(text, true);
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 objects_[Clipboard::CBF_TEXT] = parameters; 135 objects_[Clipboard::CBF_TEXT] = parameters;
134 136
135 if (is_url) { 137 if (is_url) {
136 url_text_ = utf8_text; 138 url_text_ = utf8_text;
137 } else { 139 } else {
138 url_text_.clear(); 140 url_text_.clear();
139 } 141 }
140 } 142 }
141 143
142 } // namespace ui 144 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/clipboard/scoped_clipboard_writer.h ('k') | ui/base/dragdrop/os_exchange_data_provider_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698