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

Unified Diff: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

Issue 22914008: Refactor kiosk app launch to be part of login screen UI flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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/chromeos/login/kiosk_app_menu_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
index 7cfea29016ad3daa28eaea04f467d047bf7dea2e..bded6ac9f948e2d6939daf902f17549e46250ca4 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
-#include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chromeos/chromeos_switches.h"
@@ -47,9 +46,6 @@ void KioskAppMenuHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback("kioskAppsLoaded",
base::Bind(&KioskAppMenuHandler::HandleKioskAppsLoaded,
base::Unretained(this)));
- web_ui()->RegisterMessageCallback("launchKioskApp",
- base::Bind(&KioskAppMenuHandler::HandleLaunchKioskApps,
- base::Unretained(this)));
web_ui()->RegisterMessageCallback("checkKioskAppLaunchError",
base::Bind(&KioskAppMenuHandler::HandleCheckKioskAppLaunchError,
base::Unretained(this)));
@@ -111,19 +107,6 @@ void KioskAppMenuHandler::HandleKioskAppsLoaded(
content::NotificationService::NoDetails());
}
-void KioskAppMenuHandler::HandleLaunchKioskApps(const base::ListValue* args) {
- std::string app_id;
- CHECK(args->GetString(0, &app_id));
-
- KioskAppManager::App app_data;
- CHECK(KioskAppManager::Get()->GetApp(app_id, &app_data));
-
- ExistingUserController::current_controller()->PrepareKioskAppLaunch();
-
- // KioskAppLauncher deletes itself when done.
- (new KioskAppLauncher(KioskAppManager::Get(), app_id))->Start();
-}
-
void KioskAppMenuHandler::HandleCheckKioskAppLaunchError(
const base::ListValue* args) {
KioskAppLaunchError::Error error = KioskAppLaunchError::Get();
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698