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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 | 262 |
263 aura::RootWindow* root_window = aura::RootWindow::GetInstance(); | 263 aura::RootWindow* root_window = aura::RootWindow::GetInstance(); |
264 root_window->SetCursor(aura::kCursorPointer); | 264 root_window->SetCursor(aura::kCursorPointer); |
265 | 265 |
266 activation_controller_.reset(new internal::ActivationController); | 266 activation_controller_.reset(new internal::ActivationController); |
267 | 267 |
268 aura::Window::Windows containers; | 268 aura::Window::Windows containers; |
269 CreateSpecialContainers(&containers); | 269 CreateSpecialContainers(&containers); |
270 aura::Window::Windows::const_iterator i; | 270 aura::Window::Windows::const_iterator i; |
271 for (i = containers.begin(); i != containers.end(); ++i) { | 271 for (i = containers.begin(); i != containers.end(); ++i) { |
272 (*i)->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); | 272 (*i)->Init(ui::Layer::LAYER_NOT_DRAWN); |
273 root_window->AddChild(*i); | 273 root_window->AddChild(*i); |
274 if ((*i)->id() != internal::kShellWindowId_UnparentedControlContainer) | 274 if ((*i)->id() != internal::kShellWindowId_UnparentedControlContainer) |
275 (*i)->Show(); | 275 (*i)->Show(); |
276 } | 276 } |
277 | 277 |
278 stacking_controller_.reset(new internal::StackingController); | 278 stacking_controller_.reset(new internal::StackingController); |
279 | 279 |
280 root_window_layout_ = new internal::RootWindowLayoutManager(root_window); | 280 root_window_layout_ = new internal::RootWindowLayoutManager(root_window); |
281 root_window->SetLayoutManager(root_window_layout_); | 281 root_window->SetLayoutManager(root_window_layout_); |
282 | 282 |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 | 511 |
512 // Create the desktop background image. | 512 // Create the desktop background image. |
513 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); | 513 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); |
514 } | 514 } |
515 | 515 |
516 void Shell::ResetLayoutManager(int container_id) { | 516 void Shell::ResetLayoutManager(int container_id) { |
517 GetContainer(container_id)->SetLayoutManager(NULL); | 517 GetContainer(container_id)->SetLayoutManager(NULL); |
518 } | 518 } |
519 | 519 |
520 } // namespace ash | 520 } // namespace ash |
OLD | NEW |