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

Side by Side Diff: ui/base/webui/web_ui_util.cc

Issue 660173002: Type conversion fixes, ui/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/display/util/display_util.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/webui/web_ui_util.h" 5 #include "ui/base/webui/web_ui_util.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return false; 88 return false;
89 } 89 }
90 90
91 double scale = 0; 91 double scale = 0;
92 std::string stripped; 92 std::string stripped;
93 identifier.substr(0, identifier.length() - 1).CopyToString(&stripped); 93 identifier.substr(0, identifier.length() - 1).CopyToString(&stripped);
94 if (!base::StringToDouble(stripped, &scale)) { 94 if (!base::StringToDouble(stripped, &scale)) {
95 LOG(WARNING) << "Invalid scale factor format: " << identifier; 95 LOG(WARNING) << "Invalid scale factor format: " << identifier;
96 return false; 96 return false;
97 } 97 }
98 *scale_factor = scale; 98 *scale_factor = static_cast<float>(scale);
99 return true; 99 return true;
100 } 100 }
101 101
102 void ParsePathAndScale(const GURL& url, 102 void ParsePathAndScale(const GURL& url,
103 std::string* path, 103 std::string* path,
104 float* scale_factor) { 104 float* scale_factor) {
105 *path = net::UnescapeURLComponent(url.path().substr(1), 105 *path = net::UnescapeURLComponent(url.path().substr(1),
106 (net::UnescapeRule::URL_SPECIAL_CHARS | 106 (net::UnescapeRule::URL_SPECIAL_CHARS |
107 net::UnescapeRule::SPACES)); 107 net::UnescapeRule::SPACES));
108 if (scale_factor) 108 if (scale_factor)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #endif 147 #endif
148 148
149 localized_strings->SetString("fontfamily", font_family); 149 localized_strings->SetString("fontfamily", font_family);
150 localized_strings->SetString("fontsize", 150 localized_strings->SetString("fontsize",
151 l10n_util::GetStringUTF8(web_font_size_id)); 151 l10n_util::GetStringUTF8(web_font_size_id));
152 localized_strings->SetString("textdirection", 152 localized_strings->SetString("textdirection",
153 base::i18n::IsRTL() ? "rtl" : "ltr"); 153 base::i18n::IsRTL() ? "rtl" : "ltr");
154 } 154 }
155 155
156 } // namespace webui 156 } // namespace webui
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/display/util/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698