OLD | NEW |
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "ash/magnifier/magnification_controller.h" | 48 #include "ash/magnifier/magnification_controller.h" |
49 #include "ash/magnifier/partial_magnification_controller.h" | 49 #include "ash/magnifier/partial_magnification_controller.h" |
50 #include "ash/media_controller.h" | 50 #include "ash/media_controller.h" |
51 #include "ash/new_window_controller.h" | 51 #include "ash/new_window_controller.h" |
52 #include "ash/palette_delegate.h" | 52 #include "ash/palette_delegate.h" |
53 #include "ash/public/cpp/config.h" | 53 #include "ash/public/cpp/config.h" |
54 #include "ash/public/cpp/shell_window_ids.h" | 54 #include "ash/public/cpp/shell_window_ids.h" |
55 #include "ash/root_window_controller.h" | 55 #include "ash/root_window_controller.h" |
56 #include "ash/session/session_controller.h" | 56 #include "ash/session/session_controller.h" |
57 #include "ash/session/session_state_delegate.h" | 57 #include "ash/session/session_state_delegate.h" |
| 58 #include "ash/shelf/shelf.h" |
58 #include "ash/shelf/shelf_controller.h" | 59 #include "ash/shelf/shelf_controller.h" |
59 #include "ash/shelf/shelf_model.h" | 60 #include "ash/shelf/shelf_model.h" |
60 #include "ash/shelf/shelf_window_watcher.h" | 61 #include "ash/shelf/shelf_window_watcher.h" |
61 #include "ash/shelf/wm_shelf.h" | |
62 #include "ash/shell_delegate.h" | 62 #include "ash/shell_delegate.h" |
63 #include "ash/shell_init_params.h" | 63 #include "ash/shell_init_params.h" |
64 #include "ash/shell_observer.h" | 64 #include "ash/shell_observer.h" |
65 #include "ash/shell_port.h" | 65 #include "ash/shell_port.h" |
66 #include "ash/shutdown_controller.h" | 66 #include "ash/shutdown_controller.h" |
67 #include "ash/sticky_keys/sticky_keys_controller.h" | 67 #include "ash/sticky_keys/sticky_keys_controller.h" |
68 #include "ash/system/bluetooth/bluetooth_notification_controller.h" | 68 #include "ash/system/bluetooth/bluetooth_notification_controller.h" |
69 #include "ash/system/bluetooth/tray_bluetooth_helper.h" | 69 #include "ash/system/bluetooth/tray_bluetooth_helper.h" |
70 #include "ash/system/brightness/brightness_controller_chromeos.h" | 70 #include "ash/system/brightness/brightness_controller_chromeos.h" |
71 #include "ash/system/brightness_control_delegate.h" | 71 #include "ash/system/brightness_control_delegate.h" |
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1272 void Shell::OnPrefServiceInitialized( | 1272 void Shell::OnPrefServiceInitialized( |
1273 std::unique_ptr<::PrefService> pref_service) { | 1273 std::unique_ptr<::PrefService> pref_service) { |
1274 if (!instance_) | 1274 if (!instance_) |
1275 return; | 1275 return; |
1276 // |pref_service_| is null if can't connect to Chrome (as happens when | 1276 // |pref_service_| is null if can't connect to Chrome (as happens when |
1277 // running mash outside of chrome --mash and chrome isn't built). | 1277 // running mash outside of chrome --mash and chrome isn't built). |
1278 pref_service_ = std::move(pref_service); | 1278 pref_service_ = std::move(pref_service); |
1279 } | 1279 } |
1280 | 1280 |
1281 } // namespace ash | 1281 } // namespace ash |
OLD | NEW |