Chromium Code Reviews| Index: ash/shell.h |
| diff --git a/ash/shell.h b/ash/shell.h |
| index 7c0c281ff1f98a27105f6c5db1f72d74e99d4291..ea7e9a927bc04131297ff44a9f6a96c76553e23d 100644 |
| --- a/ash/shell.h |
| +++ b/ash/shell.h |
| @@ -36,6 +36,7 @@ class UserActionClient; |
| } |
| } |
| namespace chromeos { |
| +class NetworkStateHandler; |
| class OutputConfigurator; |
| } |
| namespace content { |
| @@ -407,6 +408,10 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, |
| void DoInitialWorkspaceAnimation(); |
| #if defined(OS_CHROMEOS) |
| + // 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()
|
| + chromeos::NetworkStateHandler* network_state_handler() { |
| + return network_state_handler_.get(); |
| + } |
| chromeos::OutputConfigurator* output_configurator() { |
| return output_configurator_.get(); |
| } |
| @@ -527,6 +532,8 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, |
| scoped_ptr<internal::DisplayManager> display_manager_; |
| #if defined(OS_CHROMEOS) |
| + // Maintains a list of visible networks and their state |
|
jennyz
2012/11/27 01:43:52
nit: "state" -> "states."
|
| + scoped_ptr<chromeos::NetworkStateHandler> network_state_handler_; |
| // Controls video output device state. |
| scoped_ptr<chromeos::OutputConfigurator> output_configurator_; |
| scoped_ptr<internal::OutputConfiguratorAnimation> |