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

Side by Side Diff: ash/shell.h

Issue 1394573003: chromeos: Add SurfaceServiceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 class ShelfDelegate; 129 class ShelfDelegate;
130 class ShelfItemDelegateManager; 130 class ShelfItemDelegateManager;
131 class ShelfModel; 131 class ShelfModel;
132 class ShelfWindowWatcher; 132 class ShelfWindowWatcher;
133 class ShellDelegate; 133 class ShellDelegate;
134 struct ShellInitParams; 134 struct ShellInitParams;
135 class ShellObserver; 135 class ShellObserver;
136 class SlowAnimationEventFilter; 136 class SlowAnimationEventFilter;
137 class StatusAreaWidget; 137 class StatusAreaWidget;
138 class StickyKeysController; 138 class StickyKeysController;
139 class SurfaceController;
139 class SystemGestureEventFilter; 140 class SystemGestureEventFilter;
140 class SystemModalContainerEventFilter; 141 class SystemModalContainerEventFilter;
141 class SystemTray; 142 class SystemTray;
142 class SystemTrayDelegate; 143 class SystemTrayDelegate;
143 class SystemTrayNotifier; 144 class SystemTrayNotifier;
144 class ToplevelWindowEventHandler; 145 class ToplevelWindowEventHandler;
145 class TouchTransformerController; 146 class TouchTransformerController;
146 class TouchObserverHUD; 147 class TouchObserverHUD;
147 class UserWallpaperDelegate; 148 class UserWallpaperDelegate;
148 class VirtualKeyboardController; 149 class VirtualKeyboardController;
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 return shadow_controller_.get(); 515 return shadow_controller_.get();
515 } 516 }
516 517
517 // Starts the animation that occurs on first login. 518 // Starts the animation that occurs on first login.
518 void DoInitialWorkspaceAnimation(); 519 void DoInitialWorkspaceAnimation();
519 520
520 MaximizeModeController* maximize_mode_controller() { 521 MaximizeModeController* maximize_mode_controller() {
521 return maximize_mode_controller_.get(); 522 return maximize_mode_controller_.get();
522 } 523 }
523 524
525 SurfaceController* surface_controller() { return surface_controller_.get(); }
526
524 #if defined(OS_CHROMEOS) 527 #if defined(OS_CHROMEOS)
525 // TODO(oshima): Move these objects to WindowTreeHostManager. 528 // TODO(oshima): Move these objects to WindowTreeHostManager.
526 ui::DisplayConfigurator* display_configurator() { 529 ui::DisplayConfigurator* display_configurator() {
527 return display_configurator_.get(); 530 return display_configurator_.get();
528 } 531 }
529 DisplayConfiguratorAnimation* display_configurator_animation() { 532 DisplayConfiguratorAnimation* display_configurator_animation() {
530 return display_configurator_animation_.get(); 533 return display_configurator_animation_.get();
531 } 534 }
532 DisplayErrorObserver* display_error_observer() { 535 DisplayErrorObserver* display_error_observer() {
533 return display_error_observer_.get(); 536 return display_error_observer_.get();
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 scoped_ptr<ScreenOrientationController> screen_orientation_controller_; 744 scoped_ptr<ScreenOrientationController> screen_orientation_controller_;
742 745
743 scoped_ptr<TouchTransformerController> touch_transformer_controller_; 746 scoped_ptr<TouchTransformerController> touch_transformer_controller_;
744 747
745 scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 748 scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
746 scoped_ptr<ui::EventHandler> speech_feedback_handler_; 749 scoped_ptr<ui::EventHandler> speech_feedback_handler_;
747 #endif // defined(OS_CHROMEOS) 750 #endif // defined(OS_CHROMEOS)
748 751
749 scoped_ptr<MaximizeModeController> maximize_mode_controller_; 752 scoped_ptr<MaximizeModeController> maximize_mode_controller_;
750 753
754 scoped_ptr<SurfaceController> surface_controller_;
755
751 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 756 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
752 // pointer to vend to test code. 757 // pointer to vend to test code.
753 AshNativeCursorManager* native_cursor_manager_; 758 AshNativeCursorManager* native_cursor_manager_;
754 759
755 // Cursor may be hidden on certain key events in ChromeOS, whereas we never hide 760 // Cursor may be hidden on certain key events in ChromeOS, whereas we never hide
756 // the cursor on Windows. 761 // the cursor on Windows.
757 #if defined(OS_CHROMEOS) 762 #if defined(OS_CHROMEOS)
758 CursorManager cursor_manager_; 763 CursorManager cursor_manager_;
759 #else // !defined(OS_CHROMEOS) 764 #else // !defined(OS_CHROMEOS)
760 ::wm::CursorManager cursor_manager_; 765 ::wm::CursorManager cursor_manager_;
(...skipping 10 matching lines...) Expand all
771 scoped_ptr<GPUSupport> gpu_support_; 776 scoped_ptr<GPUSupport> gpu_support_;
772 777
773 base::SequencedWorkerPool* blocking_pool_; 778 base::SequencedWorkerPool* blocking_pool_;
774 779
775 DISALLOW_COPY_AND_ASSIGN(Shell); 780 DISALLOW_COPY_AND_ASSIGN(Shell);
776 }; 781 };
777 782
778 } // namespace ash 783 } // namespace ash
779 784
780 #endif // ASH_SHELL_H_ 785 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | chromeos/dbus/services/surface_service_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698