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

Side by Side Diff: ash/shell.cc

Issue 2870473002: Revert of Introduce ash mojo interface for lock screen action handlers (Closed)
Patch Set: 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/tray_action/tray_action.h » ('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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "ash/system/power/power_status.h" 77 #include "ash/system/power/power_status.h"
78 #include "ash/system/power/video_activity_notifier.h" 78 #include "ash/system/power/video_activity_notifier.h"
79 #include "ash/system/screen_layout_observer.h" 79 #include "ash/system/screen_layout_observer.h"
80 #include "ash/system/session/logout_confirmation_controller.h" 80 #include "ash/system/session/logout_confirmation_controller.h"
81 #include "ash/system/status_area_widget.h" 81 #include "ash/system/status_area_widget.h"
82 #include "ash/system/toast/toast_manager.h" 82 #include "ash/system/toast/toast_manager.h"
83 #include "ash/system/tray/system_tray_controller.h" 83 #include "ash/system/tray/system_tray_controller.h"
84 #include "ash/system/tray/system_tray_delegate.h" 84 #include "ash/system/tray/system_tray_delegate.h"
85 #include "ash/system/tray/system_tray_notifier.h" 85 #include "ash/system/tray/system_tray_notifier.h"
86 #include "ash/touch/ash_touch_transform_controller.h" 86 #include "ash/touch/ash_touch_transform_controller.h"
87 #include "ash/tray_action/tray_action.h"
88 #include "ash/utility/screenshot_controller.h" 87 #include "ash/utility/screenshot_controller.h"
89 #include "ash/virtual_keyboard_controller.h" 88 #include "ash/virtual_keyboard_controller.h"
90 #include "ash/wallpaper/wallpaper_controller.h" 89 #include "ash/wallpaper/wallpaper_controller.h"
91 #include "ash/wallpaper/wallpaper_delegate.h" 90 #include "ash/wallpaper/wallpaper_delegate.h"
92 #include "ash/wm/ash_focus_rules.h" 91 #include "ash/wm/ash_focus_rules.h"
93 #include "ash/wm/ash_native_cursor_manager.h" 92 #include "ash/wm/ash_native_cursor_manager.h"
94 #include "ash/wm/container_finder.h" 93 #include "ash/wm/container_finder.h"
95 #include "ash/wm/event_client_impl.h" 94 #include "ash/wm/event_client_impl.h"
96 #include "ash/wm/immersive_context_ash.h" 95 #include "ash/wm/immersive_context_ash.h"
97 #include "ash/wm/immersive_handler_factory_ash.h" 96 #include "ash/wm/immersive_handler_factory_ash.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 locale_notification_controller_( 550 locale_notification_controller_(
552 base::MakeUnique<LocaleNotificationController>()), 551 base::MakeUnique<LocaleNotificationController>()),
553 media_controller_(base::MakeUnique<MediaController>()), 552 media_controller_(base::MakeUnique<MediaController>()),
554 new_window_controller_(base::MakeUnique<NewWindowController>()), 553 new_window_controller_(base::MakeUnique<NewWindowController>()),
555 session_controller_(base::MakeUnique<SessionController>()), 554 session_controller_(base::MakeUnique<SessionController>()),
556 shelf_controller_(base::MakeUnique<ShelfController>()), 555 shelf_controller_(base::MakeUnique<ShelfController>()),
557 shell_delegate_(std::move(shell_delegate)), 556 shell_delegate_(std::move(shell_delegate)),
558 shutdown_controller_(base::MakeUnique<ShutdownController>()), 557 shutdown_controller_(base::MakeUnique<ShutdownController>()),
559 system_tray_controller_(base::MakeUnique<SystemTrayController>()), 558 system_tray_controller_(base::MakeUnique<SystemTrayController>()),
560 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()), 559 system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
561 tray_action_(base::MakeUnique<TrayAction>()),
562 vpn_list_(base::MakeUnique<VpnList>()), 560 vpn_list_(base::MakeUnique<VpnList>()),
563 window_cycle_controller_(base::MakeUnique<WindowCycleController>()), 561 window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
564 window_selector_controller_(base::MakeUnique<WindowSelectorController>()), 562 window_selector_controller_(base::MakeUnique<WindowSelectorController>()),
565 app_list_(base::MakeUnique<app_list::AppList>()), 563 app_list_(base::MakeUnique<app_list::AppList>()),
566 link_handler_model_factory_(nullptr), 564 link_handler_model_factory_(nullptr),
567 tray_bluetooth_helper_(base::MakeUnique<TrayBluetoothHelper>()), 565 tray_bluetooth_helper_(base::MakeUnique<TrayBluetoothHelper>()),
568 display_configurator_(new display::DisplayConfigurator()), 566 display_configurator_(new display::DisplayConfigurator()),
569 native_cursor_manager_(nullptr), 567 native_cursor_manager_(nullptr),
570 simulate_modal_window_open_for_testing_(false), 568 simulate_modal_window_open_for_testing_(false),
571 is_touch_hud_projection_enabled_(false) { 569 is_touch_hud_projection_enabled_(false) {
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 void Shell::OnPrefServiceInitialized( 1242 void Shell::OnPrefServiceInitialized(
1245 std::unique_ptr<::PrefService> pref_service) { 1243 std::unique_ptr<::PrefService> pref_service) {
1246 if (!instance_) 1244 if (!instance_)
1247 return; 1245 return;
1248 // |pref_service_| is null if can't connect to Chrome (as happens when 1246 // |pref_service_| is null if can't connect to Chrome (as happens when
1249 // running mash outside of chrome --mash and chrome isn't built). 1247 // running mash outside of chrome --mash and chrome isn't built).
1250 pref_service_ = std::move(pref_service); 1248 pref_service_ = std::move(pref_service);
1251 } 1249 }
1252 1250
1253 } // namespace ash 1251 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/tray_action/tray_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698