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

Side by Side Diff: ash/shell.h

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete Created 3 years, 9 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/shelf/shelf_view_unittest.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 25 matching lines...) Expand all
36 } 36 }
37 37
38 namespace base { 38 namespace base {
39 class SequencedWorkerPool; 39 class SequencedWorkerPool;
40 } 40 }
41 41
42 namespace chromeos { 42 namespace chromeos {
43 class AudioA11yController; 43 class AudioA11yController;
44 } 44 }
45 45
46 namespace app_list {
47 class AppList;
48 }
49
46 namespace display { 50 namespace display {
47 class DisplayChangeObserver; 51 class DisplayChangeObserver;
48 class DisplayConfigurator; 52 class DisplayConfigurator;
49 class DisplayManager; 53 class DisplayManager;
50 } 54 }
51 55
52 namespace gfx { 56 namespace gfx {
53 class Insets; 57 class Insets;
54 } 58 }
55 59
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // dialog. If true then changes to display settings can be saved. 273 // dialog. If true then changes to display settings can be saved.
270 bool ShouldSaveDisplaySettings(); 274 bool ShouldSaveDisplaySettings();
271 275
272 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { 276 AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
273 return accelerator_controller_delegate_.get(); 277 return accelerator_controller_delegate_.get();
274 } 278 }
275 279
276 AccessibilityDelegate* accessibility_delegate() { 280 AccessibilityDelegate* accessibility_delegate() {
277 return accessibility_delegate_.get(); 281 return accessibility_delegate_.get();
278 } 282 }
283 app_list::AppList* app_list() { return app_list_.get(); }
279 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() { 284 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
280 return blocking_pool_; 285 return blocking_pool_;
281 } 286 }
282 display::DisplayManager* display_manager() { return display_manager_.get(); } 287 display::DisplayManager* display_manager() { return display_manager_.get(); }
283 DisplayConfigurationController* display_configuration_controller() { 288 DisplayConfigurationController* display_configuration_controller() {
284 return display_configuration_controller_.get(); 289 return display_configuration_controller_.get();
285 } 290 }
286 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); } 291 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
287 views::corewm::TooltipController* tooltip_controller() { 292 views::corewm::TooltipController* tooltip_controller() {
288 return tooltip_controller_.get(); 293 return tooltip_controller_.get();
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 448
444 ScreenPinningController* screen_pinning_controller() { 449 ScreenPinningController* screen_pinning_controller() {
445 return screen_pinning_controller_.get(); 450 return screen_pinning_controller_.get();
446 } 451 }
447 452
448 GPUSupport* gpu_support() { return gpu_support_.get(); } 453 GPUSupport* gpu_support() { return gpu_support_.get(); }
449 454
450 void AddShellObserver(ShellObserver* observer); 455 void AddShellObserver(ShellObserver* observer);
451 void RemoveShellObserver(ShellObserver* observer); 456 void RemoveShellObserver(ShellObserver* observer);
452 457
458 // Shows the app list on the active root window.
459 void ShowAppList();
460
461 // Dismisses the app list.
462 void DismissAppList();
463
464 // Shows the app list if it's not visible. Dismisses it otherwise.
465 void ToggleAppList();
466
467 // Returns app list actual visibility. This might differ from
468 // GetAppListTargetVisibility() when hiding animation is still in flight.
469 bool IsAppListVisible() const;
470
471 // Returns app list target visibility.
472 bool GetAppListTargetVisibility() const;
473
453 // Notifies observers that maximize mode has started, windows might still 474 // Notifies observers that maximize mode has started, windows might still
454 // animate. 475 // animate.
455 void NotifyMaximizeModeStarted(); 476 void NotifyMaximizeModeStarted();
456 477
457 // Notifies observers that maximize mode is about to end. 478 // Notifies observers that maximize mode is about to end.
458 void NotifyMaximizeModeEnding(); 479 void NotifyMaximizeModeEnding();
459 480
460 // Notifies observers that maximize mode has ended, windows might still be 481 // Notifies observers that maximize mode has ended, windows might still be
461 // returning to their original position. 482 // returning to their original position.
462 void NotifyMaximizeModeEnded(); 483 void NotifyMaximizeModeEnded();
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 std::unique_ptr<PaletteDelegate> palette_delegate_; 577 std::unique_ptr<PaletteDelegate> palette_delegate_;
557 std::unique_ptr<DragDropController> drag_drop_controller_; 578 std::unique_ptr<DragDropController> drag_drop_controller_;
558 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 579 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
559 std::unique_ptr<ShellDelegate> shell_delegate_; 580 std::unique_ptr<ShellDelegate> shell_delegate_;
560 std::unique_ptr<ToastManager> toast_manager_; 581 std::unique_ptr<ToastManager> toast_manager_;
561 std::unique_ptr<WallpaperController> wallpaper_controller_; 582 std::unique_ptr<WallpaperController> wallpaper_controller_;
562 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; 583 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
563 std::unique_ptr<::wm::ShadowController> shadow_controller_; 584 std::unique_ptr<::wm::ShadowController> shadow_controller_;
564 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 585 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
565 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 586 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
587 std::unique_ptr<app_list::AppList> app_list_;
566 scoped_refptr<preferences::PrefClientStore> pref_store_; 588 scoped_refptr<preferences::PrefClientStore> pref_store_;
567 std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_; 589 std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
568 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 590 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
569 LinkHandlerModelFactory* link_handler_model_factory_; 591 LinkHandlerModelFactory* link_handler_model_factory_;
570 std::unique_ptr<PowerButtonController> power_button_controller_; 592 std::unique_ptr<PowerButtonController> power_button_controller_;
571 std::unique_ptr<LockStateController> lock_state_controller_; 593 std::unique_ptr<LockStateController> lock_state_controller_;
572 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 594 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
573 std::unique_ptr<VideoDetector> video_detector_; 595 std::unique_ptr<VideoDetector> video_detector_;
574 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 596 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
575 std::unique_ptr<HighContrastController> high_contrast_controller_; 597 std::unique_ptr<HighContrastController> high_contrast_controller_;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 base::ObserverList<ShellObserver> shell_observers_; 694 base::ObserverList<ShellObserver> shell_observers_;
673 695
674 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 696 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
675 697
676 DISALLOW_COPY_AND_ASSIGN(Shell); 698 DISALLOW_COPY_AND_ASSIGN(Shell);
677 }; 699 };
678 700
679 } // namespace ash 701 } // namespace ash
680 702
681 #endif // ASH_SHELL_H_ 703 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698