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

Side by Side Diff: ash/shell.h

Issue 1770993002: wip: Refactoring Ash's AppListController, moving the bulk of the logic to chrome/browser/ui/ash/app… Base URL: https://chromium.googlesource.com/chromium/src.git@small_5_apps
Patch Set: AppListShower to new component: //ui/app_list/shower, GetViewDelegate() in GetViewDelegate(), test … 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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; 653 scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
660 scoped_ptr<NewWindowDelegate> new_window_delegate_; 654 scoped_ptr<NewWindowDelegate> new_window_delegate_;
661 scoped_ptr<MediaDelegate> media_delegate_; 655 scoped_ptr<MediaDelegate> media_delegate_;
662 scoped_ptr<ShelfDelegate> shelf_delegate_; 656 scoped_ptr<ShelfDelegate> shelf_delegate_;
663 scoped_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 657 scoped_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
664 scoped_ptr<ShelfWindowWatcher> shelf_window_watcher_; 658 scoped_ptr<ShelfWindowWatcher> shelf_window_watcher_;
665 659
666 scoped_ptr<ShelfModel> shelf_model_; 660 scoped_ptr<ShelfModel> shelf_model_;
667 scoped_ptr<WindowPositioner> window_positioner_; 661 scoped_ptr<WindowPositioner> window_positioner_;
668 662
669 scoped_ptr<AppListController> app_list_controller_;
670
671 scoped_ptr<DragDropController> drag_drop_controller_; 663 scoped_ptr<DragDropController> drag_drop_controller_;
672 scoped_ptr<ResizeShadowController> resize_shadow_controller_; 664 scoped_ptr<ResizeShadowController> resize_shadow_controller_;
673 scoped_ptr< ::wm::ShadowController> shadow_controller_; 665 scoped_ptr< ::wm::ShadowController> shadow_controller_;
674 scoped_ptr< ::wm::VisibilityController> visibility_controller_; 666 scoped_ptr< ::wm::VisibilityController> visibility_controller_;
675 scoped_ptr< ::wm::WindowModalityController> window_modality_controller_; 667 scoped_ptr< ::wm::WindowModalityController> window_modality_controller_;
676 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; 668 scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
677 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 669 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
678 scoped_ptr<PowerButtonController> power_button_controller_; 670 scoped_ptr<PowerButtonController> power_button_controller_;
679 scoped_ptr<LockStateController> lock_state_controller_; 671 scoped_ptr<LockStateController> lock_state_controller_;
680 scoped_ptr<MruWindowTracker> mru_window_tracker_; 672 scoped_ptr<MruWindowTracker> mru_window_tracker_;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 bool in_mus_ = false; 768 bool in_mus_ = false;
777 769
778 scoped_ptr<KeyboardUI> keyboard_ui_; 770 scoped_ptr<KeyboardUI> keyboard_ui_;
779 771
780 DISALLOW_COPY_AND_ASSIGN(Shell); 772 DISALLOW_COPY_AND_ASSIGN(Shell);
781 }; 773 };
782 774
783 } // namespace ash 775 } // namespace ash
784 776
785 #endif // ASH_SHELL_H_ 777 #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