OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_COMMON_WM_SHELL_H_ | 5 #ifndef ASH_COMMON_WM_SHELL_H_ |
6 #define ASH_COMMON_WM_SHELL_H_ | 6 #define ASH_COMMON_WM_SHELL_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
120 return new_window_delegate_.get(); | 120 return new_window_delegate_.get(); |
121 } | 121 } |
122 | 122 |
123 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. | 123 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. |
124 void set_root_window_for_new_windows(WmWindow* root) { | 124 void set_root_window_for_new_windows(WmWindow* root) { |
125 root_window_for_new_windows_ = root; | 125 root_window_for_new_windows_ = root; |
126 } | 126 } |
127 | 127 |
128 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } | 128 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } |
129 | 129 |
130 void SetPaletteDelegateForTesting( | |
James Cook
2016/08/16 22:08:45
nit: Move this down by SetShelfDelegateForTesting
jdufault
2016/08/16 22:45:52
Ah, good. I spent some time looking for another te
| |
131 std::unique_ptr<PaletteDelegate> palette_delegate); | |
132 | |
130 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } | 133 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } |
131 | 134 |
132 ShelfModel* shelf_model() { return shelf_model_.get(); } | 135 ShelfModel* shelf_model() { return shelf_model_.get(); } |
133 | 136 |
134 SystemTrayNotifier* system_tray_notifier() { | 137 SystemTrayNotifier* system_tray_notifier() { |
135 return system_tray_notifier_.get(); | 138 return system_tray_notifier_.get(); |
136 } | 139 } |
137 | 140 |
138 SystemTrayDelegate* system_tray_delegate() { | 141 SystemTrayDelegate* system_tray_delegate() { |
139 return system_tray_delegate_.get(); | 142 return system_tray_delegate_.get(); |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
413 bool simulate_modal_window_open_for_testing_ = false; | 416 bool simulate_modal_window_open_for_testing_ = false; |
414 | 417 |
415 #if defined(OS_CHROMEOS) | 418 #if defined(OS_CHROMEOS) |
416 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 419 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
417 #endif | 420 #endif |
418 }; | 421 }; |
419 | 422 |
420 } // namespace ash | 423 } // namespace ash |
421 | 424 |
422 #endif // ASH_COMMON_WM_SHELL_H_ | 425 #endif // ASH_COMMON_WM_SHELL_H_ |
OLD | NEW |