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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 9701084: Integrate Kiosk Mode with enterprise policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix. Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/hash_tables.h" 11 #include "base/hash_tables.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/browser_shutdown.h" 16 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
18 #include "chrome/browser/chromeos/cros/network_library.h" 18 #include "chrome/browser/chromeos/cros/network_library.h"
19 #include "chrome/browser/chromeos/cros_settings.h" 19 #include "chrome/browser/chromeos/cros_settings.h"
20 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 20 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
21 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 21 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
22 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 22 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
23 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 23 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
24 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h" 24 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
25 #include "chrome/browser/chromeos/login/screen_locker.h" 25 #include "chrome/browser/chromeos/login/screen_locker.h"
26 #include "chrome/browser/chromeos/login/user.h" 26 #include "chrome/browser/chromeos/login/user.h"
27 #include "chrome/browser/chromeos/login/webui_login_display.h" 27 #include "chrome/browser/chromeos/login/webui_login_display.h"
28 #include "chrome/browser/io_thread.h" 28 #include "chrome/browser/io_thread.h"
29 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/common/chrome_notification_types.h" 30 #include "chrome/common/chrome_notification_types.h"
31 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/net/gaia/gaia_urls.h" 32 #include "chrome/common/net/gaia/gaia_urls.h"
33 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
34 #include "content/public/browser/notification_observer.h" 34 #include "content/public/browser/notification_observer.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 l10n_util::GetStringUTF16(IDS_LOGIN_PROXY_ERROR_MESSAGE)); 344 l10n_util::GetStringUTF16(IDS_LOGIN_PROXY_ERROR_MESSAGE));
345 localized_strings->SetString("createAccount", 345 localized_strings->SetString("createAccount",
346 l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML)); 346 l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML));
347 localized_strings->SetString("guestSignin", 347 localized_strings->SetString("guestSignin",
348 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML)); 348 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML));
349 localized_strings->SetString("offlineLogin", 349 localized_strings->SetString("offlineLogin",
350 l10n_util::GetStringUTF16(IDS_OFFLINE_LOGIN_HTML)); 350 l10n_util::GetStringUTF16(IDS_OFFLINE_LOGIN_HTML));
351 localized_strings->SetString("removeUser", 351 localized_strings->SetString("removeUser",
352 l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)); 352 l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE));
353 353
354 if (chromeos::KioskModeHelper::Get()->IsKioskModeEnabled()) { 354 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
355 localized_strings->SetString("demoLoginMessage", 355 localized_strings->SetString("demoLoginMessage",
356 l10n_util::GetStringUTF16(IDS_KIOSK_MODE_LOGIN_MESSAGE)); 356 l10n_util::GetStringUTF16(IDS_KIOSK_MODE_LOGIN_MESSAGE));
357 } 357 }
358 } 358 }
359 359
360 void SigninScreenHandler::Show(bool oobe_ui) { 360 void SigninScreenHandler::Show(bool oobe_ui) {
361 CHECK(delegate_); 361 CHECK(delegate_);
362 LOG(ERROR) << "Show: oobe=" << oobe_ui 362 LOG(ERROR) << "Show: oobe=" << oobe_ui
363 << ", page_is_ready=" << page_is_ready(); 363 << ", page_is_ready=" << page_is_ready();
364 364
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 !cookie_remover_ && 1009 !cookie_remover_ &&
1010 !dns_clear_task_running_ && 1010 !dns_clear_task_running_ &&
1011 network_state_informer_->is_online()) { 1011 network_state_informer_->is_online()) {
1012 gaia_silent_load_ = true; 1012 gaia_silent_load_ = true;
1013 gaia_silent_load_network_ = network_state_informer_->active_network_id(); 1013 gaia_silent_load_network_ = network_state_informer_->active_network_id();
1014 LoadAuthExtension(true, true, false); 1014 LoadAuthExtension(true, true, false);
1015 } 1015 }
1016 } 1016 }
1017 1017
1018 } // namespace chromeos 1018 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698