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

Side by Side Diff: ash/common/wm_shell.h

Issue 2567523002: mash: Have chrome set itself as the app list presenter. (Closed)
Patch Set: Address comments, Created 4 years 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/common/mojo_interface_factory.cc ('k') | ash/common/wm_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 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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
14 #include "ash/common/media_delegate.h" 14 #include "ash/common/media_delegate.h"
15 #include "ash/common/metrics/gesture_action_type.h" 15 #include "ash/common/metrics/gesture_action_type.h"
16 #include "ash/common/metrics/user_metrics_action.h" 16 #include "ash/common/metrics/user_metrics_action.h"
17 #include "ash/common/wm/lock_state_observer.h" 17 #include "ash/common/wm/lock_state_observer.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "components/ui_devtools/devtools_server.h" 19 #include "components/ui_devtools/devtools_server.h"
20 #include "ui/base/ui_base_types.h" 20 #include "ui/base/ui_base_types.h"
21 #include "ui/compositor/layer_type.h" 21 #include "ui/compositor/layer_type.h"
22 #include "ui/wm/public/window_types.h" 22 #include "ui/wm/public/window_types.h"
23 23
24 namespace app_list {
25 class AppList;
26 }
27
24 namespace base { 28 namespace base {
25 class SequencedWorkerPool; 29 class SequencedWorkerPool;
26 } 30 }
27 31
28 namespace display { 32 namespace display {
29 class Display; 33 class Display;
30 class ManagedDisplayInfo; 34 class ManagedDisplayInfo;
31 } 35 }
32 36
33 namespace gfx { 37 namespace gfx {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ShellDelegate* delegate() { return delegate_.get(); } 114 ShellDelegate* delegate() { return delegate_.get(); }
111 115
112 AcceleratorController* accelerator_controller() { 116 AcceleratorController* accelerator_controller() {
113 return accelerator_controller_.get(); 117 return accelerator_controller_.get();
114 } 118 }
115 119
116 AccessibilityDelegate* accessibility_delegate() { 120 AccessibilityDelegate* accessibility_delegate() {
117 return accessibility_delegate_.get(); 121 return accessibility_delegate_.get();
118 } 122 }
119 123
124 app_list::AppList* app_list() { return app_list_.get(); }
125
120 BrightnessControlDelegate* brightness_control_delegate() { 126 BrightnessControlDelegate* brightness_control_delegate() {
121 return brightness_control_delegate_.get(); 127 return brightness_control_delegate_.get();
122 } 128 }
123 129
124 CastConfigController* cast_config() { return cast_config_.get(); } 130 CastConfigController* cast_config() { return cast_config_.get(); }
125 131
126 FocusCycler* focus_cycler() { return focus_cycler_.get(); } 132 FocusCycler* focus_cycler() { return focus_cycler_.get(); }
127 133
128 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { 134 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
129 return keyboard_brightness_control_delegate_.get(); 135 return keyboard_brightness_control_delegate_.get();
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 friend class Shell; 480 friend class Shell;
475 friend class WmShellTestApi; 481 friend class WmShellTestApi;
476 482
477 static WmShell* instance_; 483 static WmShell* instance_;
478 484
479 base::ObserverList<ShellObserver> shell_observers_; 485 base::ObserverList<ShellObserver> shell_observers_;
480 std::unique_ptr<ShellDelegate> delegate_; 486 std::unique_ptr<ShellDelegate> delegate_;
481 487
482 std::unique_ptr<AcceleratorController> accelerator_controller_; 488 std::unique_ptr<AcceleratorController> accelerator_controller_;
483 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 489 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
490 std::unique_ptr<app_list::AppList> app_list_;
484 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 491 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
485 std::unique_ptr<CastConfigController> cast_config_; 492 std::unique_ptr<CastConfigController> cast_config_;
486 std::unique_ptr<FocusCycler> focus_cycler_; 493 std::unique_ptr<FocusCycler> focus_cycler_;
487 std::unique_ptr<ImmersiveContextAsh> immersive_context_; 494 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
488 std::unique_ptr<KeyboardBrightnessControlDelegate> 495 std::unique_ptr<KeyboardBrightnessControlDelegate>
489 keyboard_brightness_control_delegate_; 496 keyboard_brightness_control_delegate_;
490 std::unique_ptr<KeyboardUI> keyboard_ui_; 497 std::unique_ptr<KeyboardUI> keyboard_ui_;
491 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 498 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
492 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 499 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
493 std::unique_ptr<MediaDelegate> media_delegate_; 500 std::unique_ptr<MediaDelegate> media_delegate_;
(...skipping 27 matching lines...) Expand all
521 528
522 #if defined(OS_CHROMEOS) 529 #if defined(OS_CHROMEOS)
523 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 530 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
524 std::unique_ptr<VpnList> vpn_list_; 531 std::unique_ptr<VpnList> vpn_list_;
525 #endif 532 #endif
526 }; 533 };
527 534
528 } // namespace ash 535 } // namespace ash
529 536
530 #endif // ASH_COMMON_WM_SHELL_H_ 537 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698