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

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

Issue 11878022: ui: Convert scoped_arrays to the new scoped_ptr style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « ui/aura/root_window_host_linux.h ('k') | ui/base/clipboard/clipboard_gtk.cc » ('j') | 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 #include "ui/base/clipboard/clipboard.h" 5 #include "ui/base/clipboard/clipboard.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 std::string rtf_data_; 130 std::string rtf_data_;
131 131
132 // Bookmark title in UTF8 format. 132 // Bookmark title in UTF8 format.
133 std::string bookmark_title_; 133 std::string bookmark_title_;
134 std::string bookmark_url_; 134 std::string bookmark_url_;
135 135
136 // Filenames. 136 // Filenames.
137 std::vector<std::string> files_; 137 std::vector<std::string> files_;
138 138
139 // Bitmap images. 139 // Bitmap images.
140 scoped_array<uint8_t> bitmap_data_; 140 scoped_ptr<uint8_t[]> bitmap_data_;
141 gfx::Size bitmap_size_; 141 gfx::Size bitmap_size_;
142 142
143 // Data with custom format. 143 // Data with custom format.
144 std::string custom_data_format_; 144 std::string custom_data_format_;
145 std::string custom_data_data_; 145 std::string custom_data_data_;
146 146
147 // WebKit smart paste data. 147 // WebKit smart paste data.
148 bool web_smart_paste_; 148 bool web_smart_paste_;
149 149
150 int format_; 150 int format_;
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 return type; 671 return type;
672 } 672 }
673 673
674 // static 674 // static
675 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() { 675 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
676 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData)); 676 CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
677 return type; 677 return type;
678 } 678 }
679 679
680 } // namespace ui 680 } // namespace ui
OLDNEW
« no previous file with comments | « ui/aura/root_window_host_linux.h ('k') | ui/base/clipboard/clipboard_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698