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

Side by Side Diff: ash/shell.h

Issue 1861013004: AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl
Patch Set: Rebase. Created 4 years, 8 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/mus/shell_delegate_mus.cc ('k') | ash/shell.cc » ('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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 241
242 // Dismisses the app list. 242 // Dismisses the app list.
243 void DismissAppList(); 243 void DismissAppList();
244 244
245 // Shows the app list if it's not visible. Dismisses it otherwise. 245 // Shows the app list if it's not visible. Dismisses it otherwise.
246 void ToggleAppList(aura::Window* anchor); 246 void ToggleAppList(aura::Window* anchor);
247 247
248 // Returns app list target visibility. 248 // Returns app list target visibility.
249 bool GetAppListTargetVisibility() const; 249 bool GetAppListTargetVisibility() const;
250 250
251 // Returns app list window or NULL if it is not visible.
252 aura::Window* GetAppListWindow();
253
254 // Returns app list view if one exists, or NULL otherwise.
255 app_list::AppListView* GetAppListView();
256
257 // Returns true if a system-modal dialog window is currently open. 251 // Returns true if a system-modal dialog window is currently open.
258 bool IsSystemModalWindowOpen() const; 252 bool IsSystemModalWindowOpen() const;
259 253
260 // For testing only: set simulation that a modal window is open 254 // For testing only: set simulation that a modal window is open
261 void SimulateModalWindowOpenForTesting(bool modal_window_open) { 255 void SimulateModalWindowOpenForTesting(bool modal_window_open) {
262 simulate_modal_window_open_for_testing_ = modal_window_open; 256 simulate_modal_window_open_for_testing_ = modal_window_open;
263 } 257 }
264 258
265 // Creates a default views::NonClientFrameView for use by windows in the 259 // Creates a default views::NonClientFrameView for use by windows in the
266 // Ash environment. 260 // Ash environment.
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 656 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
663 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 657 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
664 std::unique_ptr<MediaDelegate> media_delegate_; 658 std::unique_ptr<MediaDelegate> media_delegate_;
665 std::unique_ptr<ShelfDelegate> shelf_delegate_; 659 std::unique_ptr<ShelfDelegate> shelf_delegate_;
666 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 660 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
667 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 661 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
668 662
669 std::unique_ptr<ShelfModel> shelf_model_; 663 std::unique_ptr<ShelfModel> shelf_model_;
670 std::unique_ptr<WindowPositioner> window_positioner_; 664 std::unique_ptr<WindowPositioner> window_positioner_;
671 665
672 std::unique_ptr<AppListController> app_list_controller_;
673
674 std::unique_ptr<DragDropController> drag_drop_controller_; 666 std::unique_ptr<DragDropController> drag_drop_controller_;
675 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 667 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
676 std::unique_ptr<::wm::ShadowController> shadow_controller_; 668 std::unique_ptr<::wm::ShadowController> shadow_controller_;
677 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 669 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
678 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 670 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
679 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 671 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
680 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 672 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
681 std::unique_ptr<PowerButtonController> power_button_controller_; 673 std::unique_ptr<PowerButtonController> power_button_controller_;
682 std::unique_ptr<LockStateController> lock_state_controller_; 674 std::unique_ptr<LockStateController> lock_state_controller_;
683 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 675 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
684 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 676 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
685 std::unique_ptr<VideoDetector> video_detector_; 677 std::unique_ptr<VideoDetector> video_detector_;
686 std::unique_ptr<WindowCycleController> window_cycle_controller_; 678 std::unique_ptr<WindowCycleController> window_cycle_controller_;
687 std::unique_ptr<WindowSelectorController> window_selector_controller_; 679 std::unique_ptr<WindowSelectorController> window_selector_controller_;
688 std::unique_ptr<FocusCycler> focus_cycler_; 680 std::unique_ptr<FocusCycler> focus_cycler_;
689 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 681 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
690 std::unique_ptr<HighContrastController> high_contrast_controller_; 682 std::unique_ptr<HighContrastController> high_contrast_controller_;
691 std::unique_ptr<MagnificationController> magnification_controller_; 683 std::unique_ptr<MagnificationController> magnification_controller_;
692 std::unique_ptr<PartialMagnificationController> 684 std::unique_ptr<PartialMagnificationController>
693 partial_magnification_controller_; 685 partial_magnification_controller_;
694 std::unique_ptr<AutoclickController> autoclick_controller_; 686 std::unique_ptr<AutoclickController> autoclick_controller_;
695 std::unique_ptr<aura::client::FocusClient> focus_client_; 687 std::unique_ptr<aura::client::FocusClient> focus_client_;
688
696 aura::client::ActivationClient* activation_client_; 689 aura::client::ActivationClient* activation_client_;
697 std::unique_ptr<PartialScreenshotController> partial_screenshot_controller_; 690 std::unique_ptr<PartialScreenshotController> partial_screenshot_controller_;
698 691
699 std::unique_ptr<MouseCursorEventFilter> mouse_cursor_filter_; 692 std::unique_ptr<MouseCursorEventFilter> mouse_cursor_filter_;
700 std::unique_ptr<ScreenPositionController> screen_position_controller_; 693 std::unique_ptr<ScreenPositionController> screen_position_controller_;
701 std::unique_ptr<SystemModalContainerEventFilter> modality_filter_; 694 std::unique_ptr<SystemModalContainerEventFilter> modality_filter_;
702 std::unique_ptr<EventClientImpl> event_client_; 695 std::unique_ptr<EventClientImpl> event_client_;
703 std::unique_ptr<EventTransformationHandler> event_transformation_handler_; 696 std::unique_ptr<EventTransformationHandler> event_transformation_handler_;
704 697
705 // An event filter that pre-handles key events while the partial 698 // An event filter that pre-handles key events while the partial
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 bool in_mus_ = false; 774 bool in_mus_ = false;
782 775
783 std::unique_ptr<KeyboardUI> keyboard_ui_; 776 std::unique_ptr<KeyboardUI> keyboard_ui_;
784 777
785 DISALLOW_COPY_AND_ASSIGN(Shell); 778 DISALLOW_COPY_AND_ASSIGN(Shell);
786 }; 779 };
787 780
788 } // namespace ash 781 } // namespace ash
789 782
790 #endif // ASH_SHELL_H_ 783 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698