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

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: Remove unnecessary braces and add missing windows_version.h include. 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
« no previous file with comments | « ash/host/root_window_host_factory_win.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 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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 chromeos::OutputConfigurator* output_configurator() { 421 chromeos::OutputConfigurator* output_configurator() {
421 return output_configurator_.get(); 422 return output_configurator_.get();
422 } 423 }
423 internal::OutputConfiguratorAnimation* output_configurator_animation() { 424 internal::OutputConfiguratorAnimation* output_configurator_animation() {
424 return output_configurator_animation_.get(); 425 return output_configurator_animation_.get();
425 } 426 }
426 #endif // defined(OS_CHROMEOS) 427 #endif // defined(OS_CHROMEOS)
427 428
428 aura::client::StackingClient* stacking_client(); 429 aura::client::StackingClient* stacking_client();
429 430
431 RootWindowHostFactory* root_window_host_factory() {
432 return root_window_host_factory_.get();
433 }
434
430 private: 435 private:
431 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 436 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
432 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 437 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
433 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 438 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
434 friend class internal::RootWindowController; 439 friend class internal::RootWindowController;
435 friend class test::ShellTestApi; 440 friend class test::ShellTestApi;
436 441
437 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 442 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
438 443
439 explicit Shell(ShellDelegate* delegate); 444 explicit Shell(ShellDelegate* delegate);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 scoped_ptr<HighContrastController> high_contrast_controller_; 521 scoped_ptr<HighContrastController> high_contrast_controller_;
517 scoped_ptr<MagnificationController> magnification_controller_; 522 scoped_ptr<MagnificationController> magnification_controller_;
518 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 523 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
519 scoped_ptr<aura::client::FocusClient> focus_client_; 524 scoped_ptr<aura::client::FocusClient> focus_client_;
520 scoped_ptr<aura::client::UserActionClient> user_action_client_; 525 scoped_ptr<aura::client::UserActionClient> user_action_client_;
521 aura::client::ActivationClient* activation_client_; 526 aura::client::ActivationClient* activation_client_;
522 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 527 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
523 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 528 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
524 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 529 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
525 scoped_ptr<internal::EventClientImpl> event_client_; 530 scoped_ptr<internal::EventClientImpl> event_client_;
531 scoped_ptr<RootWindowHostFactory> root_window_host_factory_;
526 532
527 // An event filter that rewrites or drops an event. 533 // An event filter that rewrites or drops an event.
528 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 534 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
529 535
530 // An event filter that pre-handles key events while the partial 536 // An event filter that pre-handles key events while the partial
531 // screenshot UI or the keyboard overlay is active. 537 // screenshot UI or the keyboard overlay is active.
532 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 538 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
533 539
534 // An event filter which handles system level gestures 540 // An event filter which handles system level gestures
535 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_; 541 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 573
568 // For testing only: simulate that a modal window is open 574 // For testing only: simulate that a modal window is open
569 bool simulate_modal_window_open_for_testing_; 575 bool simulate_modal_window_open_for_testing_;
570 576
571 DISALLOW_COPY_AND_ASSIGN(Shell); 577 DISALLOW_COPY_AND_ASSIGN(Shell);
572 }; 578 };
573 579
574 } // namespace ash 580 } // namespace ash
575 581
576 #endif // ASH_SHELL_H_ 582 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/host/root_window_host_factory_win.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698