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

Side by Side Diff: chrome/browser/chromeos/file_manager/url_util.cc

Issue 2392693002: Rewrite simple uses of base::ListValue::Append(base::Value*) on CrOS. (Closed)
Patch Set: MakeUnique Created 4 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
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 "chrome/browser/chromeos/file_manager/url_util.h" 5 #include "chrome/browser/chromeos/file_manager/url_util.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 arg_value.SetString("currentDirectoryURL", current_directory_url.spec()); 82 arg_value.SetString("currentDirectoryURL", current_directory_url.spec());
83 arg_value.SetString("selectionURL", selection_url.spec()); 83 arg_value.SetString("selectionURL", selection_url.spec());
84 arg_value.SetString("targetName", target_name); 84 arg_value.SetString("targetName", target_name);
85 arg_value.SetString("defaultExtension", default_extension); 85 arg_value.SetString("defaultExtension", default_extension);
86 86
87 if (file_types) { 87 if (file_types) {
88 base::ListValue* types_list = new base::ListValue(); 88 base::ListValue* types_list = new base::ListValue();
89 for (size_t i = 0; i < file_types->extensions.size(); ++i) { 89 for (size_t i = 0; i < file_types->extensions.size(); ++i) {
90 base::ListValue* extensions_list = new base::ListValue(); 90 base::ListValue* extensions_list = new base::ListValue();
91 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { 91 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) {
92 extensions_list->Append( 92 extensions_list->AppendString(file_types->extensions[i][j]);
93 new base::StringValue(file_types->extensions[i][j]));
94 } 93 }
95 94
96 base::DictionaryValue* dict = new base::DictionaryValue(); 95 base::DictionaryValue* dict = new base::DictionaryValue();
97 dict->Set("extensions", extensions_list); 96 dict->Set("extensions", extensions_list);
98 97
99 if (i < file_types->extension_description_overrides.size()) { 98 if (i < file_types->extension_description_overrides.size()) {
100 base::string16 desc = file_types->extension_description_overrides[i]; 99 base::string16 desc = file_types->extension_description_overrides[i];
101 dict->SetString("description", desc); 100 dict->SetString("description", desc);
102 } 101 }
103 102
(...skipping 30 matching lines...) Expand all
134 base::JSONWriter::Write(arg_value, &json_args); 133 base::JSONWriter::Write(arg_value, &json_args);
135 134
136 std::string url = GetFileManagerMainPageUrl().spec() + '?' + 135 std::string url = GetFileManagerMainPageUrl().spec() + '?' +
137 net::EscapeUrlEncodedData(json_args, 136 net::EscapeUrlEncodedData(json_args,
138 false); // Space to %20 instead of +. 137 false); // Space to %20 instead of +.
139 return GURL(url); 138 return GURL(url);
140 } 139 }
141 140
142 } // namespace util 141 } // namespace util
143 } // namespace file_manager 142 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698