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

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

Issue 144783002: Simplify directory initialization in Files app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up. Created 6 years, 10 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 | 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 base::string16& title, 69 const base::string16& title,
70 const base::FilePath& default_virtual_path, 70 const base::FilePath& current_directory_virtual_path,
71 const base::FilePath& selection_virtual_path,
71 const ui::SelectFileDialog::FileTypeInfo* file_types, 72 const ui::SelectFileDialog::FileTypeInfo* file_types,
72 int file_type_index, 73 int file_type_index,
73 const base::FilePath::StringType& default_extension) { 74 const base::FilePath::StringType& default_extension) {
74 base::DictionaryValue arg_value; 75 base::DictionaryValue arg_value;
75 arg_value.SetString("type", GetDialogTypeAsString(type)); 76 arg_value.SetString("type", GetDialogTypeAsString(type));
76 arg_value.SetString("title", title); 77 arg_value.SetString("title", title);
77 arg_value.SetString("defaultPath", default_virtual_path.value()); 78 arg_value.SetString(
79 "currentDirectoryPath", current_directory_virtual_path.value());
80 arg_value.SetString("selectionPath", selection_virtual_path.value());
81 arg_value.SetString("targetName", selection_virtual_path.BaseName().value());
78 arg_value.SetString("defaultExtension", default_extension); 82 arg_value.SetString("defaultExtension", default_extension);
79 83
80 if (file_types) { 84 if (file_types) {
81 base::ListValue* types_list = new base::ListValue(); 85 base::ListValue* types_list = new base::ListValue();
82 for (size_t i = 0; i < file_types->extensions.size(); ++i) { 86 for (size_t i = 0; i < file_types->extensions.size(); ++i) {
83 base::ListValue* extensions_list = new base::ListValue(); 87 base::ListValue* extensions_list = new base::ListValue();
84 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) { 88 for (size_t j = 0; j < file_types->extensions[i].size(); ++j) {
85 extensions_list->Append( 89 extensions_list->Append(
86 new base::StringValue(file_types->extensions[i][j])); 90 new base::StringValue(file_types->extensions[i][j]));
87 } 91 }
(...skipping 26 matching lines...) Expand all
114 base::JSONWriter::Write(&arg_value, &json_args); 118 base::JSONWriter::Write(&arg_value, &json_args);
115 119
116 std::string url = GetFileManagerMainPageUrl().spec() + '?' + 120 std::string url = GetFileManagerMainPageUrl().spec() + '?' +
117 net::EscapeUrlEncodedData(json_args, 121 net::EscapeUrlEncodedData(json_args,
118 false); // Space to %20 instead of +. 122 false); // Space to %20 instead of +.
119 return GURL(url); 123 return GURL(url);
120 } 124 }
121 125
122 } // namespace util 126 } // namespace util
123 } // namespace file_manager 127 } // namespace file_manager
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/file_manager/url_util.h ('k') | chrome/browser/chromeos/file_manager/url_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698