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 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
10 #include "ash/accelerators/accelerator_filter.h" | 10 #include "ash/accelerators/accelerator_filter.h" |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 | 240 |
241 aura::RootWindow* root_window = aura::RootWindow::GetInstance(); | 241 aura::RootWindow* root_window = aura::RootWindow::GetInstance(); |
242 root_window->SetCursor(aura::kCursorPointer); | 242 root_window->SetCursor(aura::kCursorPointer); |
243 | 243 |
244 activation_controller_.reset(new internal::ActivationController); | 244 activation_controller_.reset(new internal::ActivationController); |
245 | 245 |
246 aura::Window::Windows containers; | 246 aura::Window::Windows containers; |
247 CreateSpecialContainers(&containers, IsWindowModeCompact()); | 247 CreateSpecialContainers(&containers, IsWindowModeCompact()); |
248 aura::Window::Windows::const_iterator i; | 248 aura::Window::Windows::const_iterator i; |
249 for (i = containers.begin(); i != containers.end(); ++i) { | 249 for (i = containers.begin(); i != containers.end(); ++i) { |
250 (*i)->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); | 250 (*i)->Init(ui::Layer::LAYER_NOT_DRAWN); |
251 root_window->AddChild(*i); | 251 root_window->AddChild(*i); |
252 if ((*i)->id() != internal::kShellWindowId_UnparentedControlContainer) | 252 if ((*i)->id() != internal::kShellWindowId_UnparentedControlContainer) |
253 (*i)->Show(); | 253 (*i)->Show(); |
254 } | 254 } |
255 | 255 |
256 stacking_controller_.reset(new internal::StackingController); | 256 stacking_controller_.reset(new internal::StackingController); |
257 | 257 |
258 InitLayoutManagers(root_window); | 258 InitLayoutManagers(root_window); |
259 | 259 |
260 if (!command_line->HasSwitch(switches::kAuraNoShadows)) | 260 if (!command_line->HasSwitch(switches::kAuraNoShadows)) |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 default_container->SetLayoutManager( | 438 default_container->SetLayoutManager( |
439 new internal::WorkspaceLayoutManager( | 439 new internal::WorkspaceLayoutManager( |
440 workspace_controller_->workspace_manager())); | 440 workspace_controller_->workspace_manager())); |
441 } | 441 } |
442 | 442 |
443 void Shell::ResetLayoutManager(int container_id) { | 443 void Shell::ResetLayoutManager(int container_id) { |
444 GetContainer(container_id)->SetLayoutManager(NULL); | 444 GetContainer(container_id)->SetLayoutManager(NULL); |
445 } | 445 } |
446 | 446 |
447 } // namespace ash | 447 } // namespace ash |
OLD | NEW |