OLD | NEW |
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 13 matching lines...) Expand all Loading... |
24 #include "ui/gfx/size.h" | 24 #include "ui/gfx/size.h" |
25 | 25 |
26 class CommandLine; | 26 class CommandLine; |
27 | 27 |
28 namespace aura { | 28 namespace aura { |
29 class EventFilter; | 29 class EventFilter; |
30 class FocusManager; | 30 class FocusManager; |
31 class RootWindow; | 31 class RootWindow; |
32 class Window; | 32 class Window; |
33 namespace client { | 33 namespace client { |
| 34 class StackingClient; |
34 class UserActionClient; | 35 class UserActionClient; |
35 } | 36 } |
36 namespace shared { | 37 namespace shared { |
37 class CompoundEventFilter; | 38 class CompoundEventFilter; |
38 class InputMethodEventFilter; | 39 class InputMethodEventFilter; |
39 } | 40 } |
40 } | 41 } |
41 namespace chromeos { | 42 namespace chromeos { |
42 class OutputConfigurator; | 43 class OutputConfigurator; |
43 } | 44 } |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 | 404 |
404 #if defined(OS_CHROMEOS) | 405 #if defined(OS_CHROMEOS) |
405 chromeos::OutputConfigurator* output_configurator() { | 406 chromeos::OutputConfigurator* output_configurator() { |
406 return output_configurator_.get(); | 407 return output_configurator_.get(); |
407 } | 408 } |
408 internal::OutputConfiguratorAnimation* output_configurator_animation() { | 409 internal::OutputConfiguratorAnimation* output_configurator_animation() { |
409 return output_configurator_animation_.get(); | 410 return output_configurator_animation_.get(); |
410 } | 411 } |
411 #endif // defined(OS_CHROMEOS) | 412 #endif // defined(OS_CHROMEOS) |
412 | 413 |
| 414 aura::client::StackingClient* stacking_client(); |
| 415 |
413 private: | 416 private: |
414 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); | 417 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); |
415 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); | 418 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); |
416 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); | 419 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); |
417 friend class internal::RootWindowController; | 420 friend class internal::RootWindowController; |
418 | 421 |
419 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; | 422 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; |
420 | 423 |
421 explicit Shell(ShellDelegate* delegate); | 424 explicit Shell(ShellDelegate* delegate); |
422 virtual ~Shell(); | 425 virtual ~Shell(); |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 | 535 |
533 // For testing only: simulate that a modal window is open | 536 // For testing only: simulate that a modal window is open |
534 bool simulate_modal_window_open_for_testing_; | 537 bool simulate_modal_window_open_for_testing_; |
535 | 538 |
536 DISALLOW_COPY_AND_ASSIGN(Shell); | 539 DISALLOW_COPY_AND_ASSIGN(Shell); |
537 }; | 540 }; |
538 | 541 |
539 } // namespace ash | 542 } // namespace ash |
540 | 543 |
541 #endif // ASH_SHELL_H_ | 544 #endif // ASH_SHELL_H_ |
OLD | NEW |