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

Unified Diff: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

Issue 300843013: Install and launch kiosk app from cached crx file at start up. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address code review comments. Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
index ad7fa148b2a57af14224a71b7962c99a20598631..b5ae6d18093b23b7a69112f047fdf1b7e768510a 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
@@ -178,25 +178,22 @@ void KioskAppsHandler::GetLocalizedValues(content::WebUIDataSource* source) {
}
void KioskAppsHandler::OnKioskAppDataChanged(const std::string& app_id) {
- KioskAppManager::App app_data;
- if (!kiosk_app_manager_->GetApp(app_id, &app_data))
- return;
-
- base::DictionaryValue app_dict;
- PopulateAppDict(app_data, &app_dict);
-
- web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.updateApp",
- app_dict);
+ HandleKioskDataChange(app_id);
}
void KioskAppsHandler::OnKioskAppDataLoadFailure(const std::string& app_id) {
- base::StringValue app_id_value(app_id);
- web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.showError",
- app_id_value);
+ HandleKioskDataFailure(app_id);
+}
- kiosk_app_manager_->RemoveApp(app_id);
+void KioskAppsHandler::OnKioskExtensionLoadedInCache(
+ const std::string& app_id) {
+ HandleKioskDataChange(app_id);
}
+void KioskAppsHandler::OnKioskExtensionDownloadFailed(
+ const std::string& app_id) {
+ HandleKioskDataFailure(app_id);
+}
void KioskAppsHandler::OnGetConsumerKioskAutoLaunchStatus(
chromeos::KioskAppManager::ConsumerKioskAutoLaunchStatus status) {
@@ -333,4 +330,24 @@ void KioskAppsHandler::HandleSetDisableBailoutShortcut(
!disable_bailout_shortcut);
}
+void KioskAppsHandler::HandleKioskDataChange(const std::string& app_id) {
+ KioskAppManager::App app_data;
+ if (!kiosk_app_manager_->GetApp(app_id, &app_data))
+ return;
+
+ base::DictionaryValue app_dict;
+ PopulateAppDict(app_data, &app_dict);
+
+ web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.updateApp",
+ app_dict);
+}
+
+void KioskAppsHandler::HandleKioskDataFailure(const std::string& app_id) {
+ base::StringValue app_id_value(app_id);
+ web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.showError",
+ app_id_value);
+
+ kiosk_app_manager_->RemoveApp(app_id);
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698