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

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

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
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 "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/file_manager/app_id.h" 9 #include "chrome/browser/chromeos/file_manager/app_id.h"
10 #include "net/base/escape.h" 10 #include "net/base/escape.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 GURL GetFileManagerBaseUrl() { 59 GURL GetFileManagerBaseUrl() {
60 return GetFileManagerUrl("/"); 60 return GetFileManagerUrl("/");
61 } 61 }
62 62
63 GURL GetFileManagerMainPageUrl() { 63 GURL GetFileManagerMainPageUrl() {
64 return GetFileManagerUrl("/main.html"); 64 return GetFileManagerUrl("/main.html");
65 } 65 }
66 66
67 GURL GetFileManagerMainPageUrlWithParams( 67 GURL GetFileManagerMainPageUrlWithParams(
68 ui::SelectFileDialog::Type type, 68 ui::SelectFileDialog::Type type,
69 const string16& title, 69 const base::string16& title,
70 const base::FilePath& default_virtual_path, 70 const base::FilePath& default_virtual_path,
71 const ui::SelectFileDialog::FileTypeInfo* file_types, 71 const ui::SelectFileDialog::FileTypeInfo* file_types,
72 int file_type_index, 72 int file_type_index,
73 const base::FilePath::StringType& default_extension) { 73 const base::FilePath::StringType& default_extension) {
74 base::DictionaryValue arg_value; 74 base::DictionaryValue arg_value;
75 arg_value.SetString("type", GetDialogTypeAsString(type)); 75 arg_value.SetString("type", GetDialogTypeAsString(type));
76 arg_value.SetString("title", title); 76 arg_value.SetString("title", title);
77 arg_value.SetString("defaultPath", default_virtual_path.value()); 77 arg_value.SetString("defaultPath", default_virtual_path.value());
78 arg_value.SetString("defaultExtension", default_extension); 78 arg_value.SetString("defaultExtension", default_extension);
79 79
80 if (file_types) { 80 if (file_types) {
81 base::ListValue* types_list = new base::ListValue(); 81 base::ListValue* types_list = new base::ListValue();
82 for (size_t i = 0; i < file_types->extensions.size(); ++i) { 82 for (size_t i = 0; i < file_types->extensions.size(); ++i) {
83 base::ListValue* extensions_list = new base::ListValue(); 83 base::ListValue* extensions_list = new base::ListValue();
84 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { 84 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) {
85 extensions_list->Append( 85 extensions_list->Append(
86 new base::StringValue(file_types->extensions[i][j])); 86 new base::StringValue(file_types->extensions[i][j]));
87 } 87 }
88 88
89 base::DictionaryValue* dict = new base::DictionaryValue(); 89 base::DictionaryValue* dict = new base::DictionaryValue();
90 dict->Set("extensions", extensions_list); 90 dict->Set("extensions", extensions_list);
91 91
92 if (i < file_types->extension_description_overrides.size()) { 92 if (i < file_types->extension_description_overrides.size()) {
93 string16 desc = file_types->extension_description_overrides[i]; 93 base::string16 desc = file_types->extension_description_overrides[i];
94 dict->SetString("description", desc); 94 dict->SetString("description", desc);
95 } 95 }
96 96
97 // file_type_index is 1-based. 0 means no selection at all. 97 // file_type_index is 1-based. 0 means no selection at all.
98 dict->SetBoolean("selected", 98 dict->SetBoolean("selected",
99 (static_cast<size_t>(file_type_index) == (i + 1))); 99 (static_cast<size_t>(file_type_index) == (i + 1)));
100 100
101 types_list->Set(i, dict); 101 types_list->Set(i, dict);
102 } 102 }
103 arg_value.Set("typeList", types_list); 103 arg_value.Set("typeList", types_list);
(...skipping 10 matching lines...) Expand all
114 base::JSONWriter::Write(&arg_value, &json_args); 114 base::JSONWriter::Write(&arg_value, &json_args);
115 115
116 std::string url = GetFileManagerMainPageUrl().spec() + '?' + 116 std::string url = GetFileManagerMainPageUrl().spec() + '?' +
117 net::EscapeUrlEncodedData(json_args, 117 net::EscapeUrlEncodedData(json_args,
118 false); // Space to %20 instead of +. 118 false); // Space to %20 instead of +.
119 return GURL(url); 119 return GURL(url);
120 } 120 }
121 121
122 } // namespace util 122 } // namespace util
123 } // namespace file_manager 123 } // namespace file_manager
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/file_manager/url_util.h ('k') | chrome/browser/chromeos/first_run/drive_first_run_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698