Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 arg_value.SetString("type", GetDialogTypeAsString(type)); | 81 arg_value.SetString("type", GetDialogTypeAsString(type)); |
| 82 arg_value.SetString("title", title); | 82 arg_value.SetString("title", title); |
| 83 arg_value.SetString("currentDirectoryURL", current_directory_url.spec()); | 83 arg_value.SetString("currentDirectoryURL", current_directory_url.spec()); |
| 84 arg_value.SetString("selectionURL", selection_url.spec()); | 84 arg_value.SetString("selectionURL", selection_url.spec()); |
| 85 arg_value.SetString("targetName", target_name); | 85 arg_value.SetString("targetName", target_name); |
| 86 arg_value.SetString("defaultExtension", default_extension); | 86 arg_value.SetString("defaultExtension", default_extension); |
| 87 | 87 |
| 88 if (file_types) { | 88 if (file_types) { |
| 89 auto types_list = base::MakeUnique<base::ListValue>(); | 89 auto types_list = base::MakeUnique<base::ListValue>(); |
| 90 for (size_t i = 0; i < file_types->extensions.size(); ++i) { | 90 for (size_t i = 0; i < file_types->extensions.size(); ++i) { |
| 91 base::ListValue* extensions_list = new base::ListValue(); | 91 auto extensions_list = base::MakeUnique<base::ListValue>(); |
| 92 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { | 92 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { |
| 93 extensions_list->AppendString(file_types->extensions[i][j]); | 93 extensions_list->AppendString(file_types->extensions[i][j]); |
| 94 } | 94 } |
| 95 | 95 |
| 96 auto dict = base::MakeUnique<base::DictionaryValue>(); | 96 auto dict = base::MakeUnique<base::DictionaryValue>(); |
| 97 dict->Set("extensions", std::move(extensions_list)); | 97 dict->Set("extensions", std::move(extensions_list)); |
|
Daniel Erat
2017/04/06 15:03:43
hmm, this old code seems a bit odd. std::move-ing
vabr (Chromium)
2017/04/07 20:40:39
Oops, seems like I missed that in https://coderevi
| |
| 98 | 98 |
| 99 if (i < file_types->extension_description_overrides.size()) { | 99 if (i < file_types->extension_description_overrides.size()) { |
| 100 base::string16 desc = file_types->extension_description_overrides[i]; | 100 base::string16 desc = file_types->extension_description_overrides[i]; |
| 101 dict->SetString("description", desc); | 101 dict->SetString("description", desc); |
| 102 } | 102 } |
| 103 | 103 |
| 104 // file_type_index is 1-based. 0 means no selection at all. | 104 // file_type_index is 1-based. 0 means no selection at all. |
| 105 dict->SetBoolean("selected", | 105 dict->SetBoolean("selected", |
| 106 (static_cast<size_t>(file_type_index) == (i + 1))); | 106 (static_cast<size_t>(file_type_index) == (i + 1))); |
| 107 | 107 |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 134 base::JSONWriter::Write(arg_value, &json_args); | 134 base::JSONWriter::Write(arg_value, &json_args); |
| 135 | 135 |
| 136 std::string url = GetFileManagerMainPageUrl().spec() + '?' + | 136 std::string url = GetFileManagerMainPageUrl().spec() + '?' + |
| 137 net::EscapeUrlEncodedData(json_args, | 137 net::EscapeUrlEncodedData(json_args, |
| 138 false); // Space to %20 instead of +. | 138 false); // Space to %20 instead of +. |
| 139 return GURL(url); | 139 return GURL(url); |
| 140 } | 140 } |
| 141 | 141 |
| 142 } // namespace util | 142 } // namespace util |
| 143 } // namespace file_manager | 143 } // namespace file_manager |
| OLD | NEW |