| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "ui/aura_shell/shell.h" | 5 #include "ui/aura_shell/shell.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "ui/aura/aura_switches.h" | 9 #include "ui/aura/aura_switches.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 void Shell::RemoveDesktopEventFilter(aura::EventFilter* filter) { | 212 void Shell::RemoveDesktopEventFilter(aura::EventFilter* filter) { |
| 213 static_cast<internal::DesktopEventFilter*>( | 213 static_cast<internal::DesktopEventFilter*>( |
| 214 aura::Desktop::GetInstance()->event_filter())->RemoveFilter(filter); | 214 aura::Desktop::GetInstance()->event_filter())->RemoveFilter(filter); |
| 215 } | 215 } |
| 216 | 216 |
| 217 void Shell::ToggleOverview() { | 217 void Shell::ToggleOverview() { |
| 218 if (workspace_controller_.get()) | 218 if (workspace_controller_.get()) |
| 219 workspace_controller_->ToggleOverview(); | 219 workspace_controller_->ToggleOverview(); |
| 220 } | 220 } |
| 221 | 221 |
| 222 views::Widget* Shell::GetStatusAreaWidget() { |
| 223 return shelf_layout_controller_->status_widget(); |
| 224 } |
| 225 |
| 222 //////////////////////////////////////////////////////////////////////////////// | 226 //////////////////////////////////////////////////////////////////////////////// |
| 223 // Shell, private: | 227 // Shell, private: |
| 224 | 228 |
| 225 void Shell::EnableWorkspaceManager() { | 229 void Shell::EnableWorkspaceManager() { |
| 226 aura::Window* default_container = | 230 aura::Window* default_container = |
| 227 GetContainer(internal::kShellWindowId_DefaultContainer); | 231 GetContainer(internal::kShellWindowId_DefaultContainer); |
| 228 | 232 |
| 229 workspace_controller_.reset( | 233 workspace_controller_.reset( |
| 230 new internal::WorkspaceController(default_container)); | 234 new internal::WorkspaceController(default_container)); |
| 231 workspace_controller_->SetLauncherModel(launcher_->model()); | 235 workspace_controller_->SetLauncherModel(launcher_->model()); |
| 232 default_container->SetEventFilter( | 236 default_container->SetEventFilter( |
| 233 new internal::DefaultContainerEventFilter(default_container)); | 237 new internal::DefaultContainerEventFilter(default_container)); |
| 234 default_container->SetLayoutManager( | 238 default_container->SetLayoutManager( |
| 235 new internal::DefaultContainerLayoutManager( | 239 new internal::DefaultContainerLayoutManager( |
| 236 workspace_controller_->workspace_manager())); | 240 workspace_controller_->workspace_manager())); |
| 237 } | 241 } |
| 238 | 242 |
| 239 } // namespace aura_shell | 243 } // namespace aura_shell |
| OLD | NEW |