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

Side by Side Diff: chrome/browser/chromeos/login/login_display_host_impl.cc

Issue 165173002: Style fixes for demo mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/chromeos/login/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 27 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
28 #include "chrome/browser/chromeos/base/locale_util.h" 28 #include "chrome/browser/chromeos/base/locale_util.h"
29 #include "chrome/browser/chromeos/boot_times_loader.h" 29 #include "chrome/browser/chromeos/boot_times_loader.h"
30 #include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h" 30 #include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h"
31 #include "chrome/browser/chromeos/customization_document.h" 31 #include "chrome/browser/chromeos/customization_document.h"
32 #include "chrome/browser/chromeos/first_run/drive_first_run_controller.h" 32 #include "chrome/browser/chromeos/first_run/drive_first_run_controller.h"
33 #include "chrome/browser/chromeos/first_run/first_run.h" 33 #include "chrome/browser/chromeos/first_run/first_run.h"
34 #include "chrome/browser/chromeos/input_method/input_method_util.h" 34 #include "chrome/browser/chromeos/input_method/input_method_util.h"
35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
36 #include "chrome/browser/chromeos/language_preferences.h" 36 #include "chrome/browser/chromeos/language_preferences.h"
37 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
37 #include "chrome/browser/chromeos/login/existing_user_controller.h" 38 #include "chrome/browser/chromeos/login/existing_user_controller.h"
38 #include "chrome/browser/chromeos/login/helper.h" 39 #include "chrome/browser/chromeos/login/helper.h"
39 #include "chrome/browser/chromeos/login/input_events_blocker.h" 40 #include "chrome/browser/chromeos/login/input_events_blocker.h"
40 #include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h" 41 #include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h"
41 #include "chrome/browser/chromeos/login/login_utils.h" 42 #include "chrome/browser/chromeos/login/login_utils.h"
42 #include "chrome/browser/chromeos/login/login_wizard.h" 43 #include "chrome/browser/chromeos/login/login_wizard.h"
43 #include "chrome/browser/chromeos/login/oobe_display.h" 44 #include "chrome/browser/chromeos/login/oobe_display.h"
44 #include "chrome/browser/chromeos/login/startup_utils.h" 45 #include "chrome/browser/chromeos/login/startup_utils.h"
45 #include "chrome/browser/chromeos/login/user_manager.h" 46 #include "chrome/browser/chromeos/login/user_manager.h"
46 #include "chrome/browser/chromeos/login/webui_login_display.h" 47 #include "chrome/browser/chromeos/login/webui_login_display.h"
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 auth_prewarmer_.reset(new AuthPrewarmer()); 652 auth_prewarmer_.reset(new AuthPrewarmer());
652 auth_prewarmer_->PrewarmAuthentication( 653 auth_prewarmer_->PrewarmAuthentication(
653 base::Bind(&LoginDisplayHostImpl::OnAuthPrewarmDone, 654 base::Bind(&LoginDisplayHostImpl::OnAuthPrewarmDone,
654 pointer_factory_.GetWeakPtr())); 655 pointer_factory_.GetWeakPtr()));
655 } 656 }
656 657
657 void LoginDisplayHostImpl::StartDemoAppLaunch() { 658 void LoginDisplayHostImpl::StartDemoAppLaunch() {
658 LOG(WARNING) << "Login WebUI >> starting demo app."; 659 LOG(WARNING) << "Login WebUI >> starting demo app.";
659 SetStatusAreaVisible(false); 660 SetStatusAreaVisible(false);
660 661
661 demo_app_launcher_.reset(new DemoAppLauncher()); 662 demo_app_launcher_.reset(new DemoAppLauncher);
662 demo_app_launcher_->StartDemoAppLaunch(); 663 demo_app_launcher_->StartDemoAppLaunch();
663 } 664 }
664 665
665 void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id, 666 void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
666 bool diagnostic_mode) { 667 bool diagnostic_mode) {
667 LOG(WARNING) << "Login WebUI >> start app launch."; 668 LOG(WARNING) << "Login WebUI >> start app launch.";
668 SetStatusAreaVisible(false); 669 SetStatusAreaVisible(false);
669 finalize_animation_type_ = ANIMATION_FADE_OUT; 670 finalize_animation_type_ = ANIMATION_FADE_OUT;
670 if (!login_window_) 671 if (!login_window_)
671 LoadURL(GURL(kAppLaunchSplashURL)); 672 LoadURL(GURL(kAppLaunchSplashURL));
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1196 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1196 new locale_util::SwitchLanguageCallback( 1197 new locale_util::SwitchLanguageCallback(
1197 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1198 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1198 1199
1199 // Load locale keyboards here. Hardware layout would be automatically enabled. 1200 // Load locale keyboards here. Hardware layout would be automatically enabled.
1200 locale_util::SwitchLanguage( 1201 locale_util::SwitchLanguage(
1201 locale, true, true /* login_layouts_only */, callback.Pass()); 1202 locale, true, true /* login_layouts_only */, callback.Pass());
1202 } 1203 }
1203 1204
1204 } // namespace chromeos 1205 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698