| 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/desktop.h" | 10 #include "ui/aura/desktop.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 void Shell::RemoveDesktopEventFilter(aura::EventFilter* filter) { | 199 void Shell::RemoveDesktopEventFilter(aura::EventFilter* filter) { |
| 200 static_cast<internal::DesktopEventFilter*>( | 200 static_cast<internal::DesktopEventFilter*>( |
| 201 aura::Desktop::GetInstance()->event_filter())->RemoveFilter(filter); | 201 aura::Desktop::GetInstance()->event_filter())->RemoveFilter(filter); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void Shell::ToggleOverview() { | 204 void Shell::ToggleOverview() { |
| 205 if (workspace_controller_.get()) | 205 if (workspace_controller_.get()) |
| 206 workspace_controller_->ToggleOverview(); | 206 workspace_controller_->ToggleOverview(); |
| 207 } | 207 } |
| 208 | 208 |
| 209 views::Widget* Shell::GetStatusAreaWidget() { |
| 210 return shelf_layout_controller_->status(); |
| 211 } |
| 212 |
| 209 //////////////////////////////////////////////////////////////////////////////// | 213 //////////////////////////////////////////////////////////////////////////////// |
| 210 // Shell, private: | 214 // Shell, private: |
| 211 | 215 |
| 212 void Shell::EnableWorkspaceManager() { | 216 void Shell::EnableWorkspaceManager() { |
| 213 aura::Window* default_container = | 217 aura::Window* default_container = |
| 214 GetContainer(internal::kShellWindowId_DefaultContainer); | 218 GetContainer(internal::kShellWindowId_DefaultContainer); |
| 215 | 219 |
| 216 workspace_controller_.reset( | 220 workspace_controller_.reset( |
| 217 new internal::WorkspaceController(default_container)); | 221 new internal::WorkspaceController(default_container)); |
| 218 workspace_controller_->SetLauncherModel(launcher_->model()); | 222 workspace_controller_->SetLauncherModel(launcher_->model()); |
| 219 default_container->SetEventFilter( | 223 default_container->SetEventFilter( |
| 220 new internal::DefaultContainerEventFilter(default_container)); | 224 new internal::DefaultContainerEventFilter(default_container)); |
| 221 default_container->SetLayoutManager( | 225 default_container->SetLayoutManager( |
| 222 new internal::DefaultContainerLayoutManager( | 226 new internal::DefaultContainerLayoutManager( |
| 223 workspace_controller_->workspace_manager())); | 227 workspace_controller_->workspace_manager())); |
| 224 } | 228 } |
| 225 | 229 |
| 226 } // namespace aura_shell | 230 } // namespace aura_shell |
| OLD | NEW |