Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / chromeos / login / core_oobe_handler.cc

diff --git a/src/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/src/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index f20b628..568675e 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/src/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -4,13 +4,11 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
 
-#include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -26,11 +24,16 @@
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_constants.h"
 #include "grit/components_strings.h"
+#include "ui/chromeos/accessibility_types.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/keyboard/keyboard_controller.h"
 
+#if !defined(USE_ATHENA)
+#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
+#endif
+
 namespace {
 
 const char kJsScreenPath[] = "cr.ui.Oobe";
@@ -261,16 +264,18 @@ void CoreOobeHandler::HandleEnableVirtualKeyboard(bool enabled) {
 }
 
 void CoreOobeHandler::HandleEnableScreenMagnifier(bool enabled) {
+#if !defined(USE_ATHENA)
   // TODO(nkostylev): Add support for partial screen magnifier.
   DCHECK(MagnificationManager::Get());
   MagnificationManager::Get()->SetMagnifierEnabled(enabled);
+#endif
 }
 
-void CoreOobeHandler::HandleEnableSpokenFeedback() {
+void CoreOobeHandler::HandleEnableSpokenFeedback(bool /* enabled */) {
   // Checkbox is initialized on page init and updates when spoken feedback
   // setting is changed so just toggle spoken feedback here.
   AccessibilityManager::Get()->ToggleSpokenFeedback(
-      ash::A11Y_NOTIFICATION_NONE);
+      ui::A11Y_NOTIFICATION_NONE);
 }
 
 void CoreOobeHandler::HandleSetDeviceRequisition(
@@ -331,6 +336,10 @@ void CoreOobeHandler::UpdateA11yState() {
 }
 
 void CoreOobeHandler::UpdateOobeUIVisibility() {
+#if defined(USE_ATHENA)
+  // Athena builds have their own way to display version so hide ours.
+  bool should_show_version = false;
+#else
   // Don't show version label on the stable channel by default.
   bool should_show_version = true;
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
@@ -338,6 +347,7 @@ void CoreOobeHandler::UpdateOobeUIVisibility() {
       channel == chrome::VersionInfo::CHANNEL_BETA) {
     should_show_version = false;
   }
+#endif
   CallJS("showVersion", should_show_version);
   CallJS("showOobeUI", show_oobe_ui_);
   if (system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation())
@@ -379,7 +389,8 @@ void CoreOobeHandler::UpdateKeyboardState() {
 }
 
 void CoreOobeHandler::UpdateClientAreaSize() {
-  const gfx::Size& size = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
+  const gfx::Size& size =
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().size();
   SetClientAreaSize(size.width(), size.height());
 }