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

Side by Side Diff: ash/shell.cc

Issue 2876673002: mojo api for view based lockscreen (Closed)
Patch Set: hash password before sending it through mojo. Created 3 years, 7 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
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 "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 26 matching lines...) Expand all
37 #include "ash/display/window_tree_host_manager.h" 37 #include "ash/display/window_tree_host_manager.h"
38 #include "ash/drag_drop/drag_drop_controller.h" 38 #include "ash/drag_drop/drag_drop_controller.h"
39 #include "ash/first_run/first_run_helper_impl.h" 39 #include "ash/first_run/first_run_helper_impl.h"
40 #include "ash/focus_cycler.h" 40 #include "ash/focus_cycler.h"
41 #include "ash/frame/custom_frame_view_ash.h" 41 #include "ash/frame/custom_frame_view_ash.h"
42 #include "ash/gpu_support.h" 42 #include "ash/gpu_support.h"
43 #include "ash/high_contrast/high_contrast_controller.h" 43 #include "ash/high_contrast/high_contrast_controller.h"
44 #include "ash/ime/input_method_event_handler.h" 44 #include "ash/ime/input_method_event_handler.h"
45 #include "ash/keyboard/keyboard_ui.h" 45 #include "ash/keyboard/keyboard_ui.h"
46 #include "ash/laser/laser_pointer_controller.h" 46 #include "ash/laser/laser_pointer_controller.h"
47 #include "ash/login/lock_screen_controller.h"
47 #include "ash/login_status.h" 48 #include "ash/login_status.h"
48 #include "ash/magnifier/magnification_controller.h" 49 #include "ash/magnifier/magnification_controller.h"
49 #include "ash/magnifier/partial_magnification_controller.h" 50 #include "ash/magnifier/partial_magnification_controller.h"
50 #include "ash/media_controller.h" 51 #include "ash/media_controller.h"
51 #include "ash/new_window_controller.h" 52 #include "ash/new_window_controller.h"
52 #include "ash/palette_delegate.h" 53 #include "ash/palette_delegate.h"
53 #include "ash/public/cpp/config.h" 54 #include "ash/public/cpp/config.h"
54 #include "ash/public/cpp/shell_window_ids.h" 55 #include "ash/public/cpp/shell_window_ids.h"
55 #include "ash/root_window_controller.h" 56 #include "ash/root_window_controller.h"
56 #include "ash/session/session_controller.h" 57 #include "ash/session/session_controller.h"
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 : shell_port_(std::move(shell_port)), 559 : shell_port_(std::move(shell_port)),
559 brightness_control_delegate_( 560 brightness_control_delegate_(
560 base::MakeUnique<system::BrightnessControllerChromeos>()), 561 base::MakeUnique<system::BrightnessControllerChromeos>()),
561 cast_config_(base::MakeUnique<CastConfigController>()), 562 cast_config_(base::MakeUnique<CastConfigController>()),
562 focus_cycler_(base::MakeUnique<FocusCycler>()), 563 focus_cycler_(base::MakeUnique<FocusCycler>()),
563 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 564 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
564 keyboard_brightness_control_delegate_( 565 keyboard_brightness_control_delegate_(
565 base::MakeUnique<KeyboardBrightnessController>()), 566 base::MakeUnique<KeyboardBrightnessController>()),
566 locale_notification_controller_( 567 locale_notification_controller_(
567 base::MakeUnique<LocaleNotificationController>()), 568 base::MakeUnique<LocaleNotificationController>()),
569 lock_screen_controller_(base::MakeUnique<LockScreenController>()),
568 media_controller_(base::MakeUnique<MediaController>()), 570 media_controller_(base::MakeUnique<MediaController>()),
569 new_window_controller_(base::MakeUnique<NewWindowController>()), 571 new_window_controller_(base::MakeUnique<NewWindowController>()),
570 session_controller_(base::MakeUnique<SessionController>()), 572 session_controller_(base::MakeUnique<SessionController>()),
571 night_light_controller_( 573 night_light_controller_(
572 base::MakeUnique<NightLightController>(session_controller_.get())), 574 base::MakeUnique<NightLightController>(session_controller_.get())),
573 shelf_controller_(base::MakeUnique<ShelfController>()), 575 shelf_controller_(base::MakeUnique<ShelfController>()),
574 shell_delegate_(std::move(shell_delegate)), 576 shell_delegate_(std::move(shell_delegate)),
575 shutdown_controller_(base::MakeUnique<ShutdownController>()), 577 shutdown_controller_(base::MakeUnique<ShutdownController>()),
576 system_tray_controller_(base::MakeUnique<SystemTrayController>()), 578 system_tray_controller_(base::MakeUnique<SystemTrayController>()),
577 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 579 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 void Shell::OnPrefServiceInitialized( 1265 void Shell::OnPrefServiceInitialized(
1264 std::unique_ptr<::PrefService> pref_service) { 1266 std::unique_ptr<::PrefService> pref_service) {
1265 if (!instance_) 1267 if (!instance_)
1266 return; 1268 return;
1267 // |pref_service_| is null if can't connect to Chrome (as happens when 1269 // |pref_service_| is null if can't connect to Chrome (as happens when
1268 // running mash outside of chrome --mash and chrome isn't built). 1270 // running mash outside of chrome --mash and chrome isn't built).
1269 pref_service_ = std::move(pref_service); 1271 pref_service_ = std::move(pref_service);
1270 } 1272 }
1271 1273
1272 } // namespace ash 1274 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698