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

Side by Side Diff: ash/shell.cc

Issue 2876673002: mojo api for view based lockscreen (Closed)
Patch Set: Incorporate comments from patch set 8 and rebase 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
« no previous file with comments | « ash/shell.h ('k') | ash/test/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 : shell_port_(std::move(shell_port)), 555 : shell_port_(std::move(shell_port)),
555 brightness_control_delegate_( 556 brightness_control_delegate_(
556 base::MakeUnique<system::BrightnessControllerChromeos>()), 557 base::MakeUnique<system::BrightnessControllerChromeos>()),
557 cast_config_(base::MakeUnique<CastConfigController>()), 558 cast_config_(base::MakeUnique<CastConfigController>()),
558 focus_cycler_(base::MakeUnique<FocusCycler>()), 559 focus_cycler_(base::MakeUnique<FocusCycler>()),
559 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()), 560 immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
560 keyboard_brightness_control_delegate_( 561 keyboard_brightness_control_delegate_(
561 base::MakeUnique<KeyboardBrightnessController>()), 562 base::MakeUnique<KeyboardBrightnessController>()),
562 locale_notification_controller_( 563 locale_notification_controller_(
563 base::MakeUnique<LocaleNotificationController>()), 564 base::MakeUnique<LocaleNotificationController>()),
565 lock_screen_controller_(base::MakeUnique<LockScreenController>()),
564 media_controller_(base::MakeUnique<MediaController>()), 566 media_controller_(base::MakeUnique<MediaController>()),
565 new_window_controller_(base::MakeUnique<NewWindowController>()), 567 new_window_controller_(base::MakeUnique<NewWindowController>()),
566 session_controller_(base::MakeUnique<SessionController>()), 568 session_controller_(base::MakeUnique<SessionController>()),
567 night_light_controller_( 569 night_light_controller_(
568 base::MakeUnique<NightLightController>(session_controller_.get())), 570 base::MakeUnique<NightLightController>(session_controller_.get())),
569 shelf_controller_(base::MakeUnique<ShelfController>()), 571 shelf_controller_(base::MakeUnique<ShelfController>()),
570 shell_delegate_(std::move(shell_delegate)), 572 shell_delegate_(std::move(shell_delegate)),
571 shutdown_controller_(base::MakeUnique<ShutdownController>()), 573 shutdown_controller_(base::MakeUnique<ShutdownController>()),
572 system_tray_controller_(base::MakeUnique<SystemTrayController>()), 574 system_tray_controller_(base::MakeUnique<SystemTrayController>()),
573 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 575 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 void Shell::OnPrefServiceInitialized( 1277 void Shell::OnPrefServiceInitialized(
1276 std::unique_ptr<::PrefService> pref_service) { 1278 std::unique_ptr<::PrefService> pref_service) {
1277 if (!instance_) 1279 if (!instance_)
1278 return; 1280 return;
1279 // |pref_service_| is null if can't connect to Chrome (as happens when 1281 // |pref_service_| is null if can't connect to Chrome (as happens when
1280 // running mash outside of chrome --mash and chrome isn't built). 1282 // running mash outside of chrome --mash and chrome isn't built).
1281 pref_service_ = std::move(pref_service); 1283 pref_service_ = std::move(pref_service);
1282 } 1284 }
1283 1285
1284 } // namespace ash 1286 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698