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

Side by Side Diff: chrome/browser/download/save_package_file_picker.cc

Issue 10069014: Save Page As MHTML (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 8 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) 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 4
5 #include "chrome/browser/download/save_package_file_picker.h" 5 #include "chrome/browser/download/save_package_file_picker.h"
6 6
7 #include "base/metrics/histogram.h"
7 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/download/download_prefs.h" 9 #include "chrome/browser/download/download_prefs.h"
9 #include "chrome/browser/platform_util.h" 10 #include "chrome/browser/platform_util.h"
10 #include "chrome/browser/prefs/pref_member.h" 11 #include "chrome/browser/prefs/pref_member.h"
11 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
14 #include "content/public/browser/download_manager.h" 15 #include "content/public/browser/download_manager.h"
15 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
16 #include "content/public/browser/save_page_type.h" 17 #include "content/public/browser/save_page_type.h"
17 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
18 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
20 21
21 using content::RenderProcessHost; 22 using content::RenderProcessHost;
22 using content::SavePageType; 23 using content::SavePageType;
23 using content::WebContents; 24 using content::WebContents;
24 25
25 namespace { 26 namespace {
26 27
27 // If false, we don't prompt the user as to where to save the file. This 28 // If false, we don't prompt the user as to where to save the file. This
28 // exists only for testing. 29 // exists only for testing.
29 bool g_should_prompt_for_filename = true; 30 bool g_should_prompt_for_filename = true;
30 31
31 // Used for mapping between SavePageType constants and the indexes above. 32 // Used for mapping between SavePageType constants and the indexes above.
32 const SavePageType kIndexToSaveType[] = { 33 const SavePageType kIndexToSaveType[] = {
33 content::SAVE_PAGE_TYPE_UNKNOWN, 34 content::SAVE_PAGE_TYPE_UNKNOWN,
34 content::SAVE_PAGE_TYPE_AS_ONLY_HTML, 35 content::SAVE_PAGE_TYPE_AS_ONLY_HTML,
35 content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML, 36 content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML,
37 content::SAVE_PAGE_TYPE_AS_MHTML,
36 }; 38 };
37 39
38 int SavePackageTypeToIndex(SavePageType type) { 40 int SavePackageTypeToIndex(SavePageType type) {
39 for (size_t i = 0; i < arraysize(kIndexToSaveType); ++i) { 41 for (size_t i = 0; i < arraysize(kIndexToSaveType); ++i) {
40 if (kIndexToSaveType[i] == type) 42 if (kIndexToSaveType[i] == type)
41 return i; 43 return i;
42 } 44 }
43 NOTREACHED(); 45 NOTREACHED();
44 return -1; 46 return -1;
45 } 47 }
46 48
47 // Indexes used for specifying which element in the extensions dropdown 49 // Indexes used for specifying which element in the extensions dropdown
48 // the user chooses when picking a save type. 50 // the user chooses when picking a save type.
49 const int kSelectFileHtmlOnlyIndex = 1; 51 const int kSelectFileHtmlOnlyIndex = 1;
50 const int kSelectFileCompleteIndex = 2; 52 const int kSelectFileCompleteIndex = 2;
53 const int kSelectFileCompleteSingleFileIndex = 3;
51 54
52 // Used for mapping between the IDS_ string identifiers and the indexes above. 55 // Used for mapping between the IDS_ string identifiers and the indexes above.
53 const int kIndexToIDS[] = { 56 const int kIndexToIDS[] = {
54 0, IDS_SAVE_PAGE_DESC_HTML_ONLY, IDS_SAVE_PAGE_DESC_COMPLETE, 57 0,
58 IDS_SAVE_PAGE_DESC_HTML_ONLY,
59 IDS_SAVE_PAGE_DESC_COMPLETE,
60 IDS_SAVE_PAGE_DESC_COMPLETE_SINGLE_FILE,
cbentzel 2012/04/17 14:45:34 Would be nice to call this MHTML to be consistent
benjhayden 2012/04/17 17:14:36 Done.
55 }; 61 };
56 62
57 } 63 }
58 64
59 SavePackageFilePicker::SavePackageFilePicker( 65 SavePackageFilePicker::SavePackageFilePicker(
60 content::WebContents* web_contents, 66 content::WebContents* web_contents,
61 const FilePath& suggested_path, 67 const FilePath& suggested_path,
62 const FilePath::StringType& default_extension, 68 const FilePath::StringType& default_extension,
63 bool can_save_as_complete, 69 bool can_save_as_complete,
64 DownloadPrefs* download_prefs, 70 DownloadPrefs* download_prefs,
65 content::SaveFilePathPickedCallback callback) 71 content::SaveFilePathPickedCallback callback)
66 : render_process_id_(web_contents->GetRenderProcessHost()->GetID()), 72 : render_process_id_(web_contents->GetRenderProcessHost()->GetID()),
67 callback_(callback) { 73 callback_(callback) {
68 int file_type_index = SavePackageTypeToIndex( 74 int file_type_index = SavePackageTypeToIndex(
69 static_cast<SavePageType>(download_prefs->save_file_type())); 75 static_cast<SavePageType>(download_prefs->save_file_type()));
70 DCHECK_NE(-1, file_type_index); 76 DCHECK_NE(-1, file_type_index);
71 77
72 SelectFileDialog::FileTypeInfo file_type_info; 78 SelectFileDialog::FileTypeInfo file_type_info;
73 79
74 // If the contents can not be saved as complete-HTML, do not show the 80 // If the contents can not be saved as complete-HTML, do not show the
75 // file filters. 81 // file filters.
76 if (can_save_as_complete) { 82 if (can_save_as_complete) {
cbentzel 2012/04/17 14:45:34 When is |can_save_as_complete| false? Should we be
benjhayden 2012/04/17 17:14:36 can_save_as_complete = ((page_mime == "text/html")
77 bool add_extra_extension = false; 83 bool add_extra_extension = false;
78 FilePath::StringType extra_extension; 84 FilePath::StringType extra_extension;
79 if (!suggested_path.Extension().empty() && 85 if (!suggested_path.Extension().empty() &&
80 suggested_path.Extension().compare(FILE_PATH_LITERAL("htm")) && 86 suggested_path.Extension().compare(FILE_PATH_LITERAL("htm")) &&
81 suggested_path.Extension().compare(FILE_PATH_LITERAL("html"))) { 87 suggested_path.Extension().compare(FILE_PATH_LITERAL("html"))) {
82 add_extra_extension = true; 88 add_extra_extension = true;
83 extra_extension = suggested_path.Extension().substr(1); 89 extra_extension = suggested_path.Extension().substr(1);
84 } 90 }
85 91
86 file_type_info.extensions.resize(2); 92 static const size_t kNumberExtensions = arraysize(kIndexToIDS) - 1;
93 file_type_info.extensions.resize(kNumberExtensions);
cbentzel 2012/04/17 14:45:34 This resize and direct indexing is kinda gross. Ye
benjhayden 2012/04/17 17:14:36 If this used push_back and somebody re-ordered the
cbentzel 2012/04/17 20:53:33 I'm not too worried about that case, but it is rea
94 file_type_info.extension_description_overrides.resize(kNumberExtensions);
95
96 // NOTE: indices into kIndexToIDS are 1-based where as indices into
97 // file_type_info.extensions are 0-based. Hence the '-1's.
98
99 file_type_info.extension_description_overrides[
100 kSelectFileHtmlOnlyIndex - 1] = l10n_util::GetStringUTF16(kIndexToIDS[
101 kSelectFileHtmlOnlyIndex]);
87 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 102 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
88 FILE_PATH_LITERAL("htm")); 103 FILE_PATH_LITERAL("htm"));
89 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 104 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
90 FILE_PATH_LITERAL("html")); 105 FILE_PATH_LITERAL("html"));
91
92 if (add_extra_extension) { 106 if (add_extra_extension) {
93 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 107 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
94 extra_extension); 108 extra_extension);
95 } 109 }
96 110
97 file_type_info.extension_description_overrides.push_back( 111 file_type_info.extension_description_overrides[
98 l10n_util::GetStringUTF16(kIndexToIDS[kSelectFileCompleteIndex - 1])); 112 kSelectFileCompleteIndex - 1] = l10n_util::GetStringUTF16(kIndexToIDS[
113 kSelectFileCompleteIndex]);
99 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back( 114 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back(
100 FILE_PATH_LITERAL("htm")); 115 FILE_PATH_LITERAL("htm"));
101 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back( 116 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back(
102 FILE_PATH_LITERAL("html")); 117 FILE_PATH_LITERAL("html"));
103
104 if (add_extra_extension) { 118 if (add_extra_extension) {
105 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back( 119 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back(
106 extra_extension); 120 extra_extension);
107 } 121 }
108 122
109 file_type_info.extension_description_overrides.push_back( 123 file_type_info.extension_description_overrides[
110 l10n_util::GetStringUTF16(kIndexToIDS[kSelectFileCompleteIndex])); 124 kSelectFileCompleteSingleFileIndex - 1] = l10n_util::GetStringUTF16(
125 kIndexToIDS[kSelectFileCompleteSingleFileIndex]);
126 file_type_info.extensions[kSelectFileCompleteSingleFileIndex - 1].push_back(
127 FILE_PATH_LITERAL("mht"));
128 file_type_info.extensions[kSelectFileCompleteSingleFileIndex - 1].push_back(
129 FILE_PATH_LITERAL("mhtml"));
130 if (add_extra_extension) {
131 file_type_info.extensions[
132 kSelectFileCompleteSingleFileIndex - 1].push_back(extra_extension);
133 }
134
111 file_type_info.include_all_files = false; 135 file_type_info.include_all_files = false;
112 } else { 136 } else {
113 file_type_info.extensions.resize(1); 137 file_type_info.extensions.resize(1);
114 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 138 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
115 suggested_path.Extension()); 139 suggested_path.Extension());
116 140
117 if (!file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1][0].empty()) { 141 if (!file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1][0].empty()) {
118 // Drop the . 142 // Drop the .
119 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1][0].erase(0, 1); 143 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1][0].erase(0, 1);
120 } 144 }
121 145
122 file_type_info.include_all_files = true; 146 file_type_info.include_all_files = true;
123 file_type_index = 1; 147 file_type_index = 1;
124 } 148 }
125 149
126 if (g_should_prompt_for_filename) { 150 if (g_should_prompt_for_filename) {
127 select_file_dialog_ = SelectFileDialog::Create(this); 151 select_file_dialog_ = SelectFileDialog::Create(this);
128 select_file_dialog_->SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE, 152 select_file_dialog_->SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE,
129 string16(), 153 string16(),
130 suggested_path, 154 suggested_path.RemoveExtension(),
cbentzel 2012/04/17 14:45:34 Why are you doing this here? Looks like different
benjhayden 2012/04/17 17:14:36 Randy suggested doing this so that we could ensure
131 &file_type_info, 155 &file_type_info,
132 file_type_index, 156 file_type_index,
133 default_extension, 157 default_extension,
134 web_contents, 158 web_contents,
135 platform_util::GetTopLevel( 159 platform_util::GetTopLevel(
136 web_contents->GetNativeView()), 160 web_contents->GetNativeView()),
137 NULL); 161 NULL);
138 } else { 162 } else {
139 // Just use 'suggested_path' instead of opening the dialog prompt. 163 // Just use 'suggested_path' instead of opening the dialog prompt.
140 callback.Run(suggested_path, kIndexToSaveType[file_type_index]); 164 // Go through FileSelected() to pick the extension back up.
165 FileSelected(suggested_path.RemoveExtension(), file_type_index, NULL);
141 } 166 }
142 } 167 }
143 168
144 SavePackageFilePicker::~SavePackageFilePicker() { 169 SavePackageFilePicker::~SavePackageFilePicker() {
145 } 170 }
146 171
147 void SavePackageFilePicker::SetShouldPromptUser(bool should_prompt) { 172 void SavePackageFilePicker::SetShouldPromptUser(bool should_prompt) {
148 g_should_prompt_for_filename = should_prompt; 173 g_should_prompt_for_filename = should_prompt;
149 } 174 }
150 175
151 void SavePackageFilePicker::FileSelected(const FilePath& path, 176 void SavePackageFilePicker::FileSelected(const FilePath& path,
152 int index, 177 int index,
153 void* params) { 178 void* params) {
154 // The option index is not zero-based. 179 // The option index is not zero-based.
155 DCHECK(index >= kSelectFileHtmlOnlyIndex && 180 DCHECK(index >= kSelectFileHtmlOnlyIndex &&
156 index <= kSelectFileCompleteIndex); 181 index <= kSelectFileCompleteSingleFileIndex);
157 182
158 RenderProcessHost* process = RenderProcessHost::FromID(render_process_id_); 183 RenderProcessHost* process = RenderProcessHost::FromID(render_process_id_);
159 if (process) { 184 if (process) {
160 SavePageType save_type = kIndexToSaveType[index]; 185 SavePageType save_type = kIndexToSaveType[index];
186 UMA_HISTOGRAM_ENUMERATION(
187 "Download.SavePageType", save_type, content::SAVE_PAGE_TYPE_MAX);
161 Profile* profile = 188 Profile* profile =
162 Profile::FromBrowserContext(process->GetBrowserContext()); 189 Profile::FromBrowserContext(process->GetBrowserContext());
163 PrefService* prefs = profile->GetPrefs(); 190 PrefService* prefs = profile->GetPrefs();
164 if (select_file_dialog_ && 191 if (select_file_dialog_ &&
165 select_file_dialog_->HasMultipleFileTypeChoices()) 192 select_file_dialog_->HasMultipleFileTypeChoices())
166 prefs->SetInteger(prefs::kSaveFileType, save_type); 193 prefs->SetInteger(prefs::kSaveFileType, save_type);
167 194
168 StringPrefMember save_file_path; 195 StringPrefMember save_file_path;
169 save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL); 196 save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL);
170 #if defined(OS_POSIX) 197 #if defined(OS_POSIX)
171 std::string path_string = path.DirName().value(); 198 std::string path_string = path.DirName().value();
172 #elif defined(OS_WIN) 199 #elif defined(OS_WIN)
173 std::string path_string = WideToUTF8(path.DirName().value()); 200 std::string path_string = WideToUTF8(path.DirName().value());
174 #endif 201 #endif
175 // If user change the default saving directory, we will remember it just 202 // If user change the default saving directory, we will remember it just
176 // like IE and FireFox. 203 // like IE and FireFox.
177 if (!process->GetBrowserContext()->IsOffTheRecord() && 204 if (!process->GetBrowserContext()->IsOffTheRecord() &&
178 save_file_path.GetValue() != path_string) { 205 save_file_path.GetValue() != path_string) {
179 save_file_path.SetValue(path_string); 206 save_file_path.SetValue(path_string);
180 } 207 }
181 208
182 callback_.Run(path, save_type); 209 FilePath mutable_path = path;
cbentzel 2012/04/17 14:45:34 Why is this done here? Why not done before prepari
benjhayden 2012/04/17 17:14:36 See my reply to your comment on L154 of this PS.
210 if (index == kSelectFileCompleteSingleFileIndex) {
211 mutable_path = path.ReplaceExtension(FILE_PATH_LITERAL("mht"));
212 } else {
213 mutable_path = path.ReplaceExtension(FILE_PATH_LITERAL("html"));
214 }
215
216 callback_.Run(mutable_path, save_type);
183 } 217 }
184 218
185 delete this; 219 delete this;
186 } 220 }
187 221
188 void SavePackageFilePicker::FileSelectionCanceled(void* params) { 222 void SavePackageFilePicker::FileSelectionCanceled(void* params) {
189 delete this; 223 delete this;
190 } 224 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/download/save_page_browsertest.cc » ('j') | content/browser/download/save_package.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698