Chromium Code Reviews| 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 18 matching lines...) Expand all Loading... | |
| 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 StackingClient; |
| 35 class UserActionClient; | 35 class UserActionClient; |
| 36 } | 36 } |
| 37 } | 37 } |
| 38 namespace chromeos { | 38 namespace chromeos { |
| 39 class NetworkStateHandler; | |
| 39 class OutputConfigurator; | 40 class OutputConfigurator; |
| 40 } | 41 } |
| 41 namespace content { | 42 namespace content { |
| 42 class BrowserContext; | 43 class BrowserContext; |
| 43 } | 44 } |
| 44 | 45 |
| 45 namespace gfx { | 46 namespace gfx { |
| 46 class ImageSkia; | 47 class ImageSkia; |
| 47 class Point; | 48 class Point; |
| 48 class Rect; | 49 class Rect; |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 400 browser_context_ = browser_context; | 401 browser_context_ = browser_context; |
| 401 } | 402 } |
| 402 | 403 |
| 403 // Initializes the root window to be used for a secondary display. | 404 // Initializes the root window to be used for a secondary display. |
| 404 void InitRootWindowForSecondaryDisplay(aura::RootWindow* root); | 405 void InitRootWindowForSecondaryDisplay(aura::RootWindow* root); |
| 405 | 406 |
| 406 // Starts the animation that occurs on first login. | 407 // Starts the animation that occurs on first login. |
| 407 void DoInitialWorkspaceAnimation(); | 408 void DoInitialWorkspaceAnimation(); |
| 408 | 409 |
| 409 #if defined(OS_CHROMEOS) | 410 #if defined(OS_CHROMEOS) |
| 411 // This is gauranteed to outlive any UI elements so can be safely accessed. | |
|
Greg Spencer (Chromium)
2012/11/21 18:01:51
Maybe mention what manages the lifetime.
stevenjb
2012/11/27 00:58:18
Replaced with chromeos::NetworkStateHandler::Get()
| |
| 412 chromeos::NetworkStateHandler* network_state_handler() { | |
| 413 return network_state_handler_.get(); | |
| 414 } | |
| 410 chromeos::OutputConfigurator* output_configurator() { | 415 chromeos::OutputConfigurator* output_configurator() { |
| 411 return output_configurator_.get(); | 416 return output_configurator_.get(); |
| 412 } | 417 } |
| 413 internal::OutputConfiguratorAnimation* output_configurator_animation() { | 418 internal::OutputConfiguratorAnimation* output_configurator_animation() { |
| 414 return output_configurator_animation_.get(); | 419 return output_configurator_animation_.get(); |
| 415 } | 420 } |
| 416 #endif // defined(OS_CHROMEOS) | 421 #endif // defined(OS_CHROMEOS) |
| 417 | 422 |
| 418 aura::client::StackingClient* stacking_client(); | 423 aura::client::StackingClient* stacking_client(); |
| 419 | 424 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 520 // An event filter that pre-handles all key events to send them to an IME. | 525 // An event filter that pre-handles all key events to send them to an IME. |
| 521 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; | 526 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; |
| 522 | 527 |
| 523 // An event filter that silently keeps track of all touch events and controls | 528 // An event filter that silently keeps track of all touch events and controls |
| 524 // a heads-up display. This is enabled only if --ash-touch-hud flag is used. | 529 // a heads-up display. This is enabled only if --ash-touch-hud flag is used. |
| 525 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_; | 530 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_; |
| 526 | 531 |
| 527 scoped_ptr<internal::DisplayManager> display_manager_; | 532 scoped_ptr<internal::DisplayManager> display_manager_; |
| 528 | 533 |
| 529 #if defined(OS_CHROMEOS) | 534 #if defined(OS_CHROMEOS) |
| 535 // Maintains a list of visible networks and their state | |
|
jennyz
2012/11/27 01:43:52
nit: "state" -> "states."
| |
| 536 scoped_ptr<chromeos::NetworkStateHandler> network_state_handler_; | |
| 530 // Controls video output device state. | 537 // Controls video output device state. |
| 531 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; | 538 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; |
| 532 scoped_ptr<internal::OutputConfiguratorAnimation> | 539 scoped_ptr<internal::OutputConfiguratorAnimation> |
| 533 output_configurator_animation_; | 540 output_configurator_animation_; |
| 534 | 541 |
| 535 // Receives output change events and udpates the display manager. | 542 // Receives output change events and udpates the display manager. |
| 536 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; | 543 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; |
| 537 #endif // defined(OS_CHROMEOS) | 544 #endif // defined(OS_CHROMEOS) |
| 538 | 545 |
| 539 CursorManager cursor_manager_; | 546 CursorManager cursor_manager_; |
| 540 | 547 |
| 541 ObserverList<ShellObserver> observers_; | 548 ObserverList<ShellObserver> observers_; |
| 542 | 549 |
| 543 // Used by ash/shell. | 550 // Used by ash/shell. |
| 544 content::BrowserContext* browser_context_; | 551 content::BrowserContext* browser_context_; |
| 545 | 552 |
| 546 // For testing only: simulate that a modal window is open | 553 // For testing only: simulate that a modal window is open |
| 547 bool simulate_modal_window_open_for_testing_; | 554 bool simulate_modal_window_open_for_testing_; |
| 548 | 555 |
| 549 DISALLOW_COPY_AND_ASSIGN(Shell); | 556 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 550 }; | 557 }; |
| 551 | 558 |
| 552 } // namespace ash | 559 } // namespace ash |
| 553 | 560 |
| 554 #endif // ASH_SHELL_H_ | 561 #endif // ASH_SHELL_H_ |
| OLD | NEW |