OLD | NEW |
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/ui/webui/extensions/pack_extension_handler.h" | 5 #include "chrome/browser/ui/webui/extensions/pack_extension_handler.h" |
6 | 6 |
7 #include "chrome/browser/extensions/extension_creator.h" | 7 #include "chrome/browser/extensions/extension_creator.h" |
8 #include "chrome/browser/ui/chrome_select_file_policy.h" | 8 #include "chrome/browser/ui/chrome_select_file_policy.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 IDS_EXTENSION_PACK_DIALOG_KEY_FILE_TYPE_DESCRIPTION)); | 177 IDS_EXTENSION_PACK_DIALOG_KEY_FILE_TYPE_DESCRIPTION)); |
178 info.include_all_files = true; | 178 info.include_all_files = true; |
179 file_type_index = 1; | 179 file_type_index = 1; |
180 } else { | 180 } else { |
181 NOTREACHED(); | 181 NOTREACHED(); |
182 } | 182 } |
183 | 183 |
184 load_extension_dialog_ = ui::SelectFileDialog::Create( | 184 load_extension_dialog_ = ui::SelectFileDialog::Create( |
185 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents())); | 185 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents())); |
186 load_extension_dialog_->SelectFile( | 186 load_extension_dialog_->SelectFile( |
187 type, select_title, base::FilePath(), &info, file_type_index, | 187 type, |
188 FILE_PATH_LITERAL(""), | 188 select_title, |
| 189 base::FilePath(), |
| 190 &info, |
| 191 file_type_index, |
| 192 base::FilePath::StringType(), |
189 web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), | 193 web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), |
190 NULL); | 194 NULL); |
191 } | 195 } |
192 | 196 |
193 void PackExtensionHandler::ShowAlert(const std::string& message) { | 197 void PackExtensionHandler::ShowAlert(const std::string& message) { |
194 ListValue arguments; | 198 ListValue arguments; |
195 arguments.Append(Value::CreateStringValue(message)); | 199 arguments.Append(Value::CreateStringValue(message)); |
196 web_ui()->CallJavascriptFunction("PackExtensionOverlay.showError", arguments); | 200 web_ui()->CallJavascriptFunction("PackExtensionOverlay.showError", arguments); |
197 } | 201 } |
OLD | NEW |