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

Side by Side Diff: ash/shell.h

Issue 11360045: ash: Add RootWindowHostFactory class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add RootWindowHostFactory class and remove DisplayManagerDelegate. Created 8 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 | Annotate | Revision Log
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 class DesktopBackgroundController; 71 class DesktopBackgroundController;
72 class DisplayController; 72 class DisplayController;
73 class HighContrastController; 73 class HighContrastController;
74 class Launcher; 74 class Launcher;
75 class LauncherDelegate; 75 class LauncherDelegate;
76 class LauncherModel; 76 class LauncherModel;
77 class MagnificationController; 77 class MagnificationController;
78 class NestedDispatcherController; 78 class NestedDispatcherController;
79 class PartialMagnificationController; 79 class PartialMagnificationController;
80 class PowerButtonController; 80 class PowerButtonController;
81 class RootWindowHostFactory;
81 class ScreenAsh; 82 class ScreenAsh;
82 class SessionStateController; 83 class SessionStateController;
83 class ShellDelegate; 84 class ShellDelegate;
84 class ShellObserver; 85 class ShellObserver;
85 class SystemTray; 86 class SystemTray;
86 class SystemTrayDelegate; 87 class SystemTrayDelegate;
87 class SystemTrayNotifier; 88 class SystemTrayNotifier;
88 class UserActivityDetector; 89 class UserActivityDetector;
89 class UserWallpaperDelegate; 90 class UserWallpaperDelegate;
90 class VideoDetector; 91 class VideoDetector;
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 chromeos::OutputConfigurator* output_configurator() { 417 chromeos::OutputConfigurator* output_configurator() {
417 return output_configurator_.get(); 418 return output_configurator_.get();
418 } 419 }
419 internal::OutputConfiguratorAnimation* output_configurator_animation() { 420 internal::OutputConfiguratorAnimation* output_configurator_animation() {
420 return output_configurator_animation_.get(); 421 return output_configurator_animation_.get();
421 } 422 }
422 #endif // defined(OS_CHROMEOS) 423 #endif // defined(OS_CHROMEOS)
423 424
424 aura::client::StackingClient* stacking_client(); 425 aura::client::StackingClient* stacking_client();
425 426
427 RootWindowHostFactory* root_window_host_factory() {
428 return root_window_host_factory_.get();
429 }
430
426 private: 431 private:
427 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 432 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
428 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 433 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
429 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 434 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
430 friend class internal::RootWindowController; 435 friend class internal::RootWindowController;
431 friend class test::ShellTestApi; 436 friend class test::ShellTestApi;
432 437
433 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 438 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
434 439
435 explicit Shell(ShellDelegate* delegate); 440 explicit Shell(ShellDelegate* delegate);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 scoped_ptr<HighContrastController> high_contrast_controller_; 517 scoped_ptr<HighContrastController> high_contrast_controller_;
513 scoped_ptr<MagnificationController> magnification_controller_; 518 scoped_ptr<MagnificationController> magnification_controller_;
514 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 519 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
515 scoped_ptr<aura::client::FocusClient> focus_client_; 520 scoped_ptr<aura::client::FocusClient> focus_client_;
516 scoped_ptr<aura::client::UserActionClient> user_action_client_; 521 scoped_ptr<aura::client::UserActionClient> user_action_client_;
517 aura::client::ActivationClient* activation_client_; 522 aura::client::ActivationClient* activation_client_;
518 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 523 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
519 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 524 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
520 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 525 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
521 scoped_ptr<internal::EventClientImpl> event_client_; 526 scoped_ptr<internal::EventClientImpl> event_client_;
527 scoped_ptr<RootWindowHostFactory> root_window_host_factory_;
522 528
523 // An event filter that rewrites or drops an event. 529 // An event filter that rewrites or drops an event.
524 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 530 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
525 531
526 // An event filter that pre-handles key events while the partial 532 // An event filter that pre-handles key events while the partial
527 // screenshot UI or the keyboard overlay is active. 533 // screenshot UI or the keyboard overlay is active.
528 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 534 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
529 535
530 // An event filter which handles system level gestures 536 // An event filter which handles system level gestures
531 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_; 537 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 569
564 // For testing only: simulate that a modal window is open 570 // For testing only: simulate that a modal window is open
565 bool simulate_modal_window_open_for_testing_; 571 bool simulate_modal_window_open_for_testing_;
566 572
567 DISALLOW_COPY_AND_ASSIGN(Shell); 573 DISALLOW_COPY_AND_ASSIGN(Shell);
568 }; 574 };
569 575
570 } // namespace ash 576 } // namespace ash
571 577
572 #endif // ASH_SHELL_H_ 578 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698