| Index: ash/common/wm_shell.h
|
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
|
| index 79968ecf6f5c37f1942d14d18ca44d4879a8d057..964ec68767b153925ff173955c3e829886e2a3c2 100644
|
| --- a/ash/common/wm_shell.h
|
| +++ b/ash/common/wm_shell.h
|
| @@ -37,6 +37,7 @@ class KeyboardUI;
|
| class MaximizeModeController;
|
| class MruWindowTracker;
|
| class NewWindowDelegate;
|
| +class PaletteDelegate;
|
| class ScopedDisableInternalMouseAndKeyboard;
|
| class SessionStateDelegate;
|
| class ShelfDelegate;
|
| @@ -111,6 +112,8 @@ class ASH_EXPORT WmShell {
|
| return new_window_delegate_.get();
|
| }
|
|
|
| + PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
|
| +
|
| ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
|
|
|
| ShelfModel* shelf_model() { return shelf_model_.get(); }
|
| @@ -337,6 +340,7 @@ class ASH_EXPORT WmShell {
|
| std::unique_ptr<KeyboardUI> keyboard_ui_;
|
| std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
|
| std::unique_ptr<MediaDelegate> media_delegate_;
|
| + std::unique_ptr<PaletteDelegate> palette_delegate_;
|
| std::unique_ptr<MruWindowTracker> mru_window_tracker_;
|
| std::unique_ptr<NewWindowDelegate> new_window_delegate_;
|
| std::unique_ptr<ShelfDelegate> shelf_delegate_;
|
|
|