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

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: comment in GDataDownloadObserver Created 8 years, 7 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 #include "chrome/browser/download/chrome_download_manager_delegate.h"
2 // Use of this source code is governed by a BSD-style license that can be 3 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 4 // found in the LICENSE file.
4 5
5 #include "chrome/browser/download/save_package_file_picker.h" 6 #include "chrome/browser/download/save_package_file_picker.h"
6 7
8 #include "base/command_line.h"
9 #include "base/metrics/histogram.h"
7 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/download/chrome_download_manager_delegate.h"
8 #include "chrome/browser/download/download_prefs.h" 12 #include "chrome/browser/download/download_prefs.h"
9 #include "chrome/browser/platform_util.h" 13 #include "chrome/browser/platform_util.h"
10 #include "chrome/browser/prefs/pref_member.h" 14 #include "chrome/browser/prefs/pref_member.h"
11 #include "chrome/browser/prefs/pref_service.h" 15 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
14 #include "content/public/browser/download_manager.h" 19 #include "content/public/browser/download_manager.h"
15 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
16 #include "content/public/browser/save_page_type.h" 21 #include "content/public/browser/save_page_type.h"
17 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
18 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
20 25
21 using content::RenderProcessHost; 26 using content::RenderProcessHost;
22 using content::SavePageType; 27 using content::SavePageType;
(...skipping 24 matching lines...) Expand all
47 // Indexes used for specifying which element in the extensions dropdown 52 // Indexes used for specifying which element in the extensions dropdown
48 // the user chooses when picking a save type. 53 // the user chooses when picking a save type.
49 const int kSelectFileHtmlOnlyIndex = 1; 54 const int kSelectFileHtmlOnlyIndex = 1;
50 const int kSelectFileCompleteIndex = 2; 55 const int kSelectFileCompleteIndex = 2;
51 56
52 // Used for mapping between the IDS_ string identifiers and the indexes above. 57 // Used for mapping between the IDS_ string identifiers and the indexes above.
53 const int kIndexToIDS[] = { 58 const int kIndexToIDS[] = {
54 0, IDS_SAVE_PAGE_DESC_HTML_ONLY, IDS_SAVE_PAGE_DESC_COMPLETE, 59 0, IDS_SAVE_PAGE_DESC_HTML_ONLY, IDS_SAVE_PAGE_DESC_COMPLETE,
55 }; 60 };
56 61
62 void OnSavePackageDownloadCreated(
63 content::DownloadItem* download) {
64 ChromeDownloadManagerDelegate::DisableSafeBrowsing(download);
65 }
66
67 } // anonymous namespace
68
69 bool SavePackageFilePicker::ShouldSaveAsMHTML() const {
70 return can_save_as_complete_ &&
cbentzel 2012/04/26 20:35:16 Nit: could you just pass this in as an argument ra
benjhayden 2012/04/26 20:49:44 This is used in the FileSelected() method. I could
achuithb 2012/04/26 21:01:45 Please don't use the void* params. I think they ar
71 CommandLine::ForCurrentProcess()->HasSwitch(
72 switches::kSavePageAsMHTML);
57 } 73 }
58 74
59 SavePackageFilePicker::SavePackageFilePicker( 75 SavePackageFilePicker::SavePackageFilePicker(
60 content::WebContents* web_contents, 76 content::WebContents* web_contents,
61 const FilePath& suggested_path, 77 const FilePath& suggested_path_const,
62 const FilePath::StringType& default_extension, 78 const FilePath::StringType& default_extension_const,
63 bool can_save_as_complete, 79 bool can_save_as_complete,
64 DownloadPrefs* download_prefs, 80 DownloadPrefs* download_prefs,
65 content::SaveFilePathPickedCallback callback) 81 const content::SaveFilePathPickedCallback& callback)
66 : render_process_id_(web_contents->GetRenderProcessHost()->GetID()), 82 : render_process_id_(web_contents->GetRenderProcessHost()->GetID()),
83 can_save_as_complete_(can_save_as_complete),
67 callback_(callback) { 84 callback_(callback) {
85 FilePath suggested_path = suggested_path_const;
86 FilePath::StringType default_extension = default_extension_const;
68 int file_type_index = SavePackageTypeToIndex( 87 int file_type_index = SavePackageTypeToIndex(
69 static_cast<SavePageType>(download_prefs->save_file_type())); 88 static_cast<SavePageType>(download_prefs->save_file_type()));
70 DCHECK_NE(-1, file_type_index); 89 DCHECK_NE(-1, file_type_index);
71 90
72 SelectFileDialog::FileTypeInfo file_type_info; 91 SelectFileDialog::FileTypeInfo file_type_info;
73 92
74 // If the contents can not be saved as complete-HTML, do not show the 93 // TODO(benjhayden): Merge the first branch with the second when all of the
75 // file filters. 94 // platform-specific file selection dialog implementations fully support
76 if (can_save_as_complete) { 95 // switching save-as file formats, and remove the flag/switch.
96 if (ShouldSaveAsMHTML()) {
97 default_extension = FILE_PATH_LITERAL("mhtml");
98 suggested_path = suggested_path.ReplaceExtension(default_extension);
99 } else if (can_save_as_complete) {
77 bool add_extra_extension = false; 100 bool add_extra_extension = false;
78 FilePath::StringType extra_extension; 101 FilePath::StringType extra_extension;
79 if (!suggested_path.Extension().empty() && 102 if (!suggested_path.Extension().empty() &&
80 suggested_path.Extension().compare(FILE_PATH_LITERAL("htm")) && 103 suggested_path.Extension().compare(FILE_PATH_LITERAL("htm")) &&
81 suggested_path.Extension().compare(FILE_PATH_LITERAL("html"))) { 104 suggested_path.Extension().compare(FILE_PATH_LITERAL("html"))) {
82 add_extra_extension = true; 105 add_extra_extension = true;
83 extra_extension = suggested_path.Extension().substr(1); 106 extra_extension = suggested_path.Extension().substr(1);
84 } 107 }
85 108
86 file_type_info.extensions.resize(2); 109 static const size_t kNumberExtensions = arraysize(kIndexToIDS) - 1;
110 file_type_info.extensions.resize(kNumberExtensions);
111 file_type_info.extension_description_overrides.resize(kNumberExtensions);
112
113 // Indices into kIndexToIDS are 1-based whereas indices into
114 // file_type_info.extensions are 0-based. Hence the '-1's.
115 // If you switch these resize()/direct-assignment patterns to push_back(),
116 // then you risk breaking FileSelected()'s use of |index|.
117
118 file_type_info.extension_description_overrides[
119 kSelectFileHtmlOnlyIndex - 1] = l10n_util::GetStringUTF16(kIndexToIDS[
120 kSelectFileHtmlOnlyIndex]);
87 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 121 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
88 FILE_PATH_LITERAL("htm")); 122 FILE_PATH_LITERAL("htm"));
89 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 123 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
90 FILE_PATH_LITERAL("html")); 124 FILE_PATH_LITERAL("html"));
91
92 if (add_extra_extension) { 125 if (add_extra_extension) {
93 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 126 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back(
94 extra_extension); 127 extra_extension);
95 } 128 }
96 129
97 file_type_info.extension_description_overrides.push_back( 130 file_type_info.extension_description_overrides[
98 l10n_util::GetStringUTF16(kIndexToIDS[kSelectFileCompleteIndex - 1])); 131 kSelectFileCompleteIndex - 1] = l10n_util::GetStringUTF16(kIndexToIDS[
132 kSelectFileCompleteIndex]);
99 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back( 133 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back(
100 FILE_PATH_LITERAL("htm")); 134 FILE_PATH_LITERAL("htm"));
101 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back( 135 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back(
102 FILE_PATH_LITERAL("html")); 136 FILE_PATH_LITERAL("html"));
103
104 if (add_extra_extension) { 137 if (add_extra_extension) {
105 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back( 138 file_type_info.extensions[kSelectFileCompleteIndex - 1].push_back(
106 extra_extension); 139 extra_extension);
107 } 140 }
108 141
109 file_type_info.extension_description_overrides.push_back(
110 l10n_util::GetStringUTF16(kIndexToIDS[kSelectFileCompleteIndex]));
111 file_type_info.include_all_files = false; 142 file_type_info.include_all_files = false;
112 } else { 143 } else {
144 // The contents can not be saved as complete-HTML, so do not show the file
145 // filters.
113 file_type_info.extensions.resize(1); 146 file_type_info.extensions.resize(1);
114 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1].push_back( 147 file_type_info.extensions[0].push_back(
115 suggested_path.Extension()); 148 suggested_path.Extension());
116 149
117 if (!file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1][0].empty()) { 150 if (!file_type_info.extensions[0][0].empty()) {
118 // Drop the . 151 // Drop the .
119 file_type_info.extensions[kSelectFileHtmlOnlyIndex - 1][0].erase(0, 1); 152 file_type_info.extensions[0][0].erase(0, 1);
120 } 153 }
121 154
122 file_type_info.include_all_files = true; 155 file_type_info.include_all_files = true;
123 file_type_index = 1; 156 file_type_index = 1;
124 } 157 }
125 158
126 if (g_should_prompt_for_filename) { 159 if (g_should_prompt_for_filename) {
127 select_file_dialog_ = SelectFileDialog::Create(this); 160 select_file_dialog_ = SelectFileDialog::Create(this);
128 select_file_dialog_->SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE, 161 select_file_dialog_->SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE,
129 string16(), 162 string16(),
130 suggested_path, 163 suggested_path,
131 &file_type_info, 164 &file_type_info,
132 file_type_index, 165 file_type_index,
133 default_extension, 166 default_extension,
134 web_contents, 167 web_contents,
135 platform_util::GetTopLevel( 168 platform_util::GetTopLevel(
136 web_contents->GetNativeView()), 169 web_contents->GetNativeView()),
137 NULL); 170 NULL);
138 } else { 171 } else {
139 // Just use 'suggested_path' instead of opening the dialog prompt. 172 // Just use 'suggested_path' instead of opening the dialog prompt.
140 callback.Run(suggested_path, kIndexToSaveType[file_type_index]); 173 // Go through FileSelected() for consistency.
174 FileSelected(suggested_path, file_type_index, NULL);
141 } 175 }
142 } 176 }
143 177
144 SavePackageFilePicker::~SavePackageFilePicker() { 178 SavePackageFilePicker::~SavePackageFilePicker() {
145 } 179 }
146 180
147 void SavePackageFilePicker::SetShouldPromptUser(bool should_prompt) { 181 void SavePackageFilePicker::SetShouldPromptUser(bool should_prompt) {
148 g_should_prompt_for_filename = should_prompt; 182 g_should_prompt_for_filename = should_prompt;
149 } 183 }
150 184
151 void SavePackageFilePicker::FileSelected(const FilePath& path, 185 void SavePackageFilePicker::FileSelected(const FilePath& path,
152 int index, 186 int index,
153 void* params) { 187 void* unused_params) {
154 // The option index is not zero-based.
155 DCHECK(index >= kSelectFileHtmlOnlyIndex &&
156 index <= kSelectFileCompleteIndex);
157
158 RenderProcessHost* process = RenderProcessHost::FromID(render_process_id_); 188 RenderProcessHost* process = RenderProcessHost::FromID(render_process_id_);
159 if (process) { 189 if (process) {
160 SavePageType save_type = kIndexToSaveType[index]; 190 SavePageType save_type = content::SAVE_PAGE_TYPE_UNKNOWN;
161 Profile* profile = 191 PrefService* prefs = Profile::FromBrowserContext(
162 Profile::FromBrowserContext(process->GetBrowserContext()); 192 process->GetBrowserContext())->GetPrefs();
163 PrefService* prefs = profile->GetPrefs(); 193 if (ShouldSaveAsMHTML()) {
164 if (select_file_dialog_ && 194 save_type = content::SAVE_PAGE_TYPE_AS_MHTML;
165 select_file_dialog_->HasMultipleFileTypeChoices()) 195 } else {
166 prefs->SetInteger(prefs::kSaveFileType, save_type); 196 // The option index is not zero-based.
197 DCHECK(index >= kSelectFileHtmlOnlyIndex &&
198 index <= kSelectFileCompleteIndex);
199 save_type = kIndexToSaveType[index];
200 if (select_file_dialog_ &&
201 select_file_dialog_->HasMultipleFileTypeChoices())
202 prefs->SetInteger(prefs::kSaveFileType, save_type);
203 }
204
205 UMA_HISTOGRAM_ENUMERATION("Download.SavePageType",
206 save_type,
207 content::SAVE_PAGE_TYPE_MAX);
167 208
168 StringPrefMember save_file_path; 209 StringPrefMember save_file_path;
169 save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL); 210 save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL);
170 #if defined(OS_POSIX) 211 #if defined(OS_POSIX)
171 std::string path_string = path.DirName().value(); 212 std::string path_string = path.DirName().value();
172 #elif defined(OS_WIN) 213 #elif defined(OS_WIN)
173 std::string path_string = WideToUTF8(path.DirName().value()); 214 std::string path_string = WideToUTF8(path.DirName().value());
174 #endif 215 #endif
175 // If user change the default saving directory, we will remember it just 216 // If user change the default saving directory, we will remember it just
176 // like IE and FireFox. 217 // like IE and FireFox.
177 if (!process->GetBrowserContext()->IsOffTheRecord() && 218 if (!process->GetBrowserContext()->IsOffTheRecord() &&
178 save_file_path.GetValue() != path_string) { 219 save_file_path.GetValue() != path_string)
179 save_file_path.SetValue(path_string); 220 save_file_path.SetValue(path_string);
180 }
181 221
182 callback_.Run(path, save_type); 222 callback_.Run(path, save_type, base::Bind(&OnSavePackageDownloadCreated));
183 } 223 }
184 224
185 delete this; 225 delete this;
186 } 226 }
187 227
188 void SavePackageFilePicker::FileSelectionCanceled(void* params) { 228 void SavePackageFilePicker::FileSelectionCanceled(void* unused_params) {
189 delete this; 229 delete this;
190 } 230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698