| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/extensions/extensions_ui.h" | 5 #include "chrome/browser/extensions/extensions_ui.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 IDS_EXTENSION_PACK_DIALOG_ERROR_KEY_INVALID)); | 604 IDS_EXTENSION_PACK_DIALOG_ERROR_KEY_INVALID)); |
| 605 return; | 605 return; |
| 606 } | 606 } |
| 607 | 607 |
| 608 pack_job_ = new PackExtensionJob(this, root_directory, key_file); | 608 pack_job_ = new PackExtensionJob(this, root_directory, key_file); |
| 609 pack_job_->Start(); | 609 pack_job_->Start(); |
| 610 } | 610 } |
| 611 | 611 |
| 612 void ExtensionsDOMHandler::OnPackSuccess(const FilePath& crx_file, | 612 void ExtensionsDOMHandler::OnPackSuccess(const FilePath& crx_file, |
| 613 const FilePath& pem_file) { | 613 const FilePath& pem_file) { |
| 614 ShowAlert(WideToUTF8(PackExtensionJob::StandardSuccessMessage(crx_file, | 614 ShowAlert(UTF16ToUTF8(PackExtensionJob::StandardSuccessMessage(crx_file, |
| 615 pem_file))); | 615 pem_file))); |
| 616 | 616 |
| 617 ListValue results; | 617 ListValue results; |
| 618 dom_ui_->CallJavascriptFunction(L"hidePackDialog", results); | 618 dom_ui_->CallJavascriptFunction(L"hidePackDialog", results); |
| 619 } | 619 } |
| 620 | 620 |
| 621 void ExtensionsDOMHandler::OnPackFailure(const std::string& error) { | 621 void ExtensionsDOMHandler::OnPackFailure(const std::string& error) { |
| 622 ShowAlert(error); | 622 ShowAlert(error); |
| 623 } | 623 } |
| 624 | 624 |
| 625 void ExtensionsDOMHandler::HandleAutoUpdateMessage(const ListValue* args) { | 625 void ExtensionsDOMHandler::HandleAutoUpdateMessage(const ListValue* args) { |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 // static | 956 // static |
| 957 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() { | 957 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() { |
| 958 return ResourceBundle::GetSharedInstance(). | 958 return ResourceBundle::GetSharedInstance(). |
| 959 LoadDataResourceBytes(IDR_PLUGIN); | 959 LoadDataResourceBytes(IDR_PLUGIN); |
| 960 } | 960 } |
| 961 | 961 |
| 962 // static | 962 // static |
| 963 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) { | 963 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) { |
| 964 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false); | 964 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false); |
| 965 } | 965 } |
| OLD | NEW |