| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/ui/webui/chromeos/login/signin_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "chrome/browser/chromeos/login/wizard_controller.h" | 46 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 47 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 47 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 48 #include "chrome/browser/chromeos/policy/device_local_account.h" | 48 #include "chrome/browser/chromeos/policy/device_local_account.h" |
| 49 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 49 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 50 #include "chrome/browser/chromeos/settings/cros_settings.h" | 50 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 51 #include "chrome/browser/chromeos/system/system_clock.h" | 51 #include "chrome/browser/chromeos/system/system_clock.h" |
| 52 #include "chrome/browser/io_thread.h" | 52 #include "chrome/browser/io_thread.h" |
| 53 #include "chrome/browser/profiles/profile.h" | 53 #include "chrome/browser/profiles/profile.h" |
| 54 #include "chrome/browser/profiles/profile_metrics.h" | 54 #include "chrome/browser/profiles/profile_metrics.h" |
| 55 #include "chrome/browser/signin/easy_unlock_service.h" | 55 #include "chrome/browser/signin/easy_unlock_service.h" |
| 56 #include "chrome/browser/ui/ash/ash_util.h" |
| 56 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" | 57 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" |
| 57 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" | 58 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" |
| 58 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" | 59 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" |
| 59 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" | 60 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" |
| 60 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" | 61 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" |
| 61 #include "chrome/common/pref_names.h" | 62 #include "chrome/common/pref_names.h" |
| 62 #include "chrome/common/url_constants.h" | 63 #include "chrome/common/url_constants.h" |
| 63 #include "chrome/grit/chromium_strings.h" | 64 #include "chrome/grit/chromium_strings.h" |
| 64 #include "chrome/grit/generated_resources.h" | 65 #include "chrome/grit/generated_resources.h" |
| 65 #include "chromeos/dbus/dbus_thread_manager.h" | 66 #include "chromeos/dbus/dbus_thread_manager.h" |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 content::NotificationService::AllSources()); | 266 content::NotificationService::AllSources()); |
| 266 registrar_.Add(this, | 267 registrar_.Add(this, |
| 267 chrome::NOTIFICATION_AUTH_CANCELLED, | 268 chrome::NOTIFICATION_AUTH_CANCELLED, |
| 268 content::NotificationService::AllSources()); | 269 content::NotificationService::AllSources()); |
| 269 | 270 |
| 270 chromeos::input_method::ImeKeyboard* keyboard = | 271 chromeos::input_method::ImeKeyboard* keyboard = |
| 271 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); | 272 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); |
| 272 if (keyboard) | 273 if (keyboard) |
| 273 keyboard->AddObserver(this); | 274 keyboard->AddObserver(this); |
| 274 | 275 |
| 275 max_mode_delegate_.reset(new TouchViewControllerDelegate()); | 276 if (!chrome::IsRunningInMash()) { |
| 276 max_mode_delegate_->AddObserver(this); | 277 max_mode_delegate_.reset(new TouchViewControllerDelegate()); |
| 278 max_mode_delegate_->AddObserver(this); |
| 279 } else { |
| 280 NOTIMPLEMENTED(); |
| 281 } |
| 277 } | 282 } |
| 278 | 283 |
| 279 SigninScreenHandler::~SigninScreenHandler() { | 284 SigninScreenHandler::~SigninScreenHandler() { |
| 280 OobeUI* oobe_ui = GetOobeUI(); | 285 OobeUI* oobe_ui = GetOobeUI(); |
| 281 if (oobe_ui && oobe_ui_observer_added_) | 286 if (oobe_ui && oobe_ui_observer_added_) |
| 282 oobe_ui->RemoveObserver(this); | 287 oobe_ui->RemoveObserver(this); |
| 283 chromeos::input_method::ImeKeyboard* keyboard = | 288 chromeos::input_method::ImeKeyboard* keyboard = |
| 284 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); | 289 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); |
| 285 if (keyboard) | 290 if (keyboard) |
| 286 keyboard->RemoveObserver(this); | 291 keyboard->RemoveObserver(this); |
| (...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1416 } | 1421 } |
| 1417 | 1422 |
| 1418 void SigninScreenHandler::OnFeedbackFinished() { | 1423 void SigninScreenHandler::OnFeedbackFinished() { |
| 1419 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); | 1424 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); |
| 1420 | 1425 |
| 1421 // Recreate user's cryptohome after the feedkback is attempted. | 1426 // Recreate user's cryptohome after the feedkback is attempted. |
| 1422 HandleResyncUserData(); | 1427 HandleResyncUserData(); |
| 1423 } | 1428 } |
| 1424 | 1429 |
| 1425 } // namespace chromeos | 1430 } // namespace chromeos |
| OLD | NEW |