| OLD | NEW |
| 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 #include "chrome/browser/extensions/file_manager_util.h" | 4 #include "chrome/browser/extensions/file_manager_util.h" |
| 5 | 5 |
| 6 #include "base/json/json_writer.h" | 6 #include "base/json/json_writer.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 arg_value.SetString("title", title); | 158 arg_value.SetString("title", title); |
| 159 arg_value.SetString("defaultPath", default_virtual_path.value()); | 159 arg_value.SetString("defaultPath", default_virtual_path.value()); |
| 160 arg_value.SetString("defaultExtension", default_extension); | 160 arg_value.SetString("defaultExtension", default_extension); |
| 161 | 161 |
| 162 if (file_types) { | 162 if (file_types) { |
| 163 ListValue* types_list = new ListValue(); | 163 ListValue* types_list = new ListValue(); |
| 164 for (size_t i = 0; i < file_types->extensions.size(); ++i) { | 164 for (size_t i = 0; i < file_types->extensions.size(); ++i) { |
| 165 ListValue* extensions_list = new ListValue(); | 165 ListValue* extensions_list = new ListValue(); |
| 166 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { | 166 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { |
| 167 extensions_list->Set( | 167 extensions_list->Set( |
| 168 i, Value::CreateStringValue(file_types->extensions[i][j])); | 168 i, base::StringValue::New(file_types->extensions[i][j])); |
| 169 } | 169 } |
| 170 | 170 |
| 171 DictionaryValue* dict = new DictionaryValue(); | 171 DictionaryValue* dict = new DictionaryValue(); |
| 172 dict->Set("extensions", extensions_list); | 172 dict->Set("extensions", extensions_list); |
| 173 | 173 |
| 174 if (i < file_types->extension_description_overrides.size()) { | 174 if (i < file_types->extension_description_overrides.size()) { |
| 175 string16 desc = file_types->extension_description_overrides[i]; | 175 string16 desc = file_types->extension_description_overrides[i]; |
| 176 dict->SetString("description", desc); | 176 dict->SetString("description", desc); |
| 177 } | 177 } |
| 178 | 178 |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 case SelectFileDialog::SELECT_OPEN_MULTI_FILE: | 291 case SelectFileDialog::SELECT_OPEN_MULTI_FILE: |
| 292 type_str = "open-multi-file"; | 292 type_str = "open-multi-file"; |
| 293 break; | 293 break; |
| 294 | 294 |
| 295 default: | 295 default: |
| 296 NOTREACHED(); | 296 NOTREACHED(); |
| 297 } | 297 } |
| 298 | 298 |
| 299 return type_str; | 299 return type_str; |
| 300 } | 300 } |
| OLD | NEW |