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

Side by Side Diff: content/public/common/webplugininfo.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | « content/public/common/pepper_plugin_info.cc ('k') | content/public/test/browser_test_utils.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) 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 "content/public/common/webplugininfo.h" 5 #include "content/public/common/webplugininfo.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/version.h" 13 #include "base/version.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 WebPluginMimeType::WebPluginMimeType() {} 17 WebPluginMimeType::WebPluginMimeType() {}
18 18
19 WebPluginMimeType::WebPluginMimeType(const std::string& m, 19 WebPluginMimeType::WebPluginMimeType(const std::string& m,
20 const std::string& f, 20 const std::string& f,
21 const std::string& d) 21 const std::string& d)
22 : mime_type(m), 22 : mime_type(m),
23 file_extensions(), 23 file_extensions(),
24 description(ASCIIToUTF16(d)) { 24 description(base::ASCIIToUTF16(d)) {
25 file_extensions.push_back(f); 25 file_extensions.push_back(f);
26 } 26 }
27 27
28 WebPluginMimeType::~WebPluginMimeType() {} 28 WebPluginMimeType::~WebPluginMimeType() {}
29 29
30 WebPluginInfo::WebPluginInfo() 30 WebPluginInfo::WebPluginInfo()
31 : type(PLUGIN_TYPE_NPAPI), 31 : type(PLUGIN_TYPE_NPAPI),
32 pepper_permissions(0) { 32 pepper_permissions(0) {
33 } 33 }
34 34
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 no_leading_zeros_version += (j < n) ? numbers[i].substr(j) : "0"; 94 no_leading_zeros_version += (j < n) ? numbers[i].substr(j) : "0";
95 if (i != numbers.size() - 1) { 95 if (i != numbers.size() - 1) {
96 no_leading_zeros_version += "."; 96 no_leading_zeros_version += ".";
97 } 97 }
98 } 98 }
99 99
100 *parsed_version = base::Version(no_leading_zeros_version); 100 *parsed_version = base::Version(no_leading_zeros_version);
101 } 101 }
102 102
103 } // namespace content 103 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/pepper_plugin_info.cc ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698