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 "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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 default_container->set_id(internal::kShellWindowId_DefaultContainer); | 74 default_container->set_id(internal::kShellWindowId_DefaultContainer); |
75 containers->push_back(default_container); | 75 containers->push_back(default_container); |
76 | 76 |
77 aura::Window* always_on_top_container = new aura::Window(NULL); | 77 aura::Window* always_on_top_container = new aura::Window(NULL); |
78 always_on_top_container->SetEventFilter( | 78 always_on_top_container->SetEventFilter( |
79 new ToplevelWindowEventFilter(always_on_top_container)); | 79 new ToplevelWindowEventFilter(always_on_top_container)); |
80 always_on_top_container->set_id( | 80 always_on_top_container->set_id( |
81 internal::kShellWindowId_AlwaysOnTopContainer); | 81 internal::kShellWindowId_AlwaysOnTopContainer); |
82 containers->push_back(always_on_top_container); | 82 containers->push_back(always_on_top_container); |
83 | 83 |
| 84 aura::Window* panel_container = new aura::Window(NULL); |
| 85 panel_container->set_id(internal::kShellWindowId_PanelContainer); |
| 86 containers->push_back(panel_container); |
| 87 |
84 aura::Window* launcher_container = new aura::Window(NULL); | 88 aura::Window* launcher_container = new aura::Window(NULL); |
85 launcher_container->set_id(internal::kShellWindowId_LauncherContainer); | 89 launcher_container->set_id(internal::kShellWindowId_LauncherContainer); |
86 containers->push_back(launcher_container); | 90 containers->push_back(launcher_container); |
87 | 91 |
88 aura::Window* modal_container = new aura::Window(NULL); | 92 aura::Window* modal_container = new aura::Window(NULL); |
89 modal_container->SetEventFilter( | 93 modal_container->SetEventFilter( |
90 new ToplevelWindowEventFilter(modal_container)); | 94 new ToplevelWindowEventFilter(modal_container)); |
91 modal_container->SetLayoutManager( | 95 modal_container->SetLayoutManager( |
92 new internal::ModalContainerLayoutManager(modal_container)); | 96 new internal::ModalContainerLayoutManager(modal_container)); |
93 modal_container->set_id(internal::kShellWindowId_ModalContainer); | 97 modal_container->set_id(internal::kShellWindowId_ModalContainer); |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 new internal::WorkspaceController(default_container)); | 378 new internal::WorkspaceController(default_container)); |
375 workspace_controller_->SetLauncherModel(launcher_->model()); | 379 workspace_controller_->SetLauncherModel(launcher_->model()); |
376 default_container->SetEventFilter( | 380 default_container->SetEventFilter( |
377 new internal::DefaultContainerEventFilter(default_container)); | 381 new internal::DefaultContainerEventFilter(default_container)); |
378 default_container->SetLayoutManager( | 382 default_container->SetLayoutManager( |
379 new internal::DefaultContainerLayoutManager( | 383 new internal::DefaultContainerLayoutManager( |
380 workspace_controller_->workspace_manager())); | 384 workspace_controller_->workspace_manager())); |
381 } | 385 } |
382 | 386 |
383 } // namespace ash | 387 } // namespace ash |
OLD | NEW |