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

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

Issue 10096012: [cros] Add Ctrl+Alt+E shortcut to Welcome/EULA screen that cancels update and starts with enrollment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 8 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/core_oobe_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 56ace891d662eaf42e5221e4d5f149fa40181d54..8b0ded5bb5d554396e00eaa161a900cd5e0c74da 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -9,6 +9,7 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
+#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/web_ui.h"
@@ -21,6 +22,7 @@ namespace {
// JS API callbacks names.
const char kJsApiScreenStateInitialize[] = "screenStateInitialize";
const char kJsApiToggleAccessibility[] = "toggleAccessibility";
+const char kJsApiSkipUpdateEnrollAfterEula[] = "skipUpdateEnrollAfterEula";
} // namespace
@@ -61,21 +63,32 @@ void CoreOobeHandler::Initialize() {
void CoreOobeHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(kJsApiToggleAccessibility,
- base::Bind(&CoreOobeHandler::OnToggleAccessibility,
+ base::Bind(&CoreOobeHandler::HandleToggleAccessibility,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(kJsApiScreenStateInitialize,
- base::Bind(&CoreOobeHandler::OnInitialized,
+ base::Bind(&CoreOobeHandler::HandleInitialized,
+ base::Unretained(this)));
+ web_ui()->RegisterMessageCallback(kJsApiSkipUpdateEnrollAfterEula,
+ base::Bind(&CoreOobeHandler::HandleSkipUpdateEnrollAfterEula,
base::Unretained(this)));
}
-void CoreOobeHandler::OnInitialized(const base::ListValue* args) {
+void CoreOobeHandler::HandleInitialized(const base::ListValue* args) {
oobe_ui_->InitializeHandlers();
}
-void CoreOobeHandler::OnToggleAccessibility(const base::ListValue* args) {
+void CoreOobeHandler::HandleToggleAccessibility(const base::ListValue* args) {
accessibility::ToggleSpokenFeedback(web_ui());
}
+void CoreOobeHandler::HandleSkipUpdateEnrollAfterEula(
+ const base::ListValue* args) {
+ WizardController* controller = WizardController::default_controller();
+ DCHECK(controller);
+ if (controller)
+ controller->SkipUpdateEnrollAfterEula();
+}
+
void CoreOobeHandler::ShowOobeUI(bool show) {
if (show == show_oobe_ui_)
return;

Powered by Google App Engine
This is Rietveld 408576698