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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 default_container->set_id(internal::kShellWindowId_DefaultContainer); | 68 default_container->set_id(internal::kShellWindowId_DefaultContainer); |
69 containers->push_back(default_container); | 69 containers->push_back(default_container); |
70 | 70 |
71 aura::Window* always_on_top_container = new aura::Window(NULL); | 71 aura::Window* always_on_top_container = new aura::Window(NULL); |
72 always_on_top_container->SetEventFilter( | 72 always_on_top_container->SetEventFilter( |
73 new ToplevelWindowEventFilter(always_on_top_container)); | 73 new ToplevelWindowEventFilter(always_on_top_container)); |
74 always_on_top_container->set_id( | 74 always_on_top_container->set_id( |
75 internal::kShellWindowId_AlwaysOnTopContainer); | 75 internal::kShellWindowId_AlwaysOnTopContainer); |
76 containers->push_back(always_on_top_container); | 76 containers->push_back(always_on_top_container); |
77 | 77 |
| 78 aura::Window* panel_container = new aura::Window(NULL); |
| 79 panel_container->set_id(internal::kShellWindowId_PanelContainer); |
| 80 containers->push_back(panel_container); |
| 81 |
78 aura::Window* launcher_container = new aura::Window(NULL); | 82 aura::Window* launcher_container = new aura::Window(NULL); |
79 launcher_container->set_id(internal::kShellWindowId_LauncherContainer); | 83 launcher_container->set_id(internal::kShellWindowId_LauncherContainer); |
80 containers->push_back(launcher_container); | 84 containers->push_back(launcher_container); |
81 | 85 |
82 aura::Window* modal_container = new aura::Window(NULL); | 86 aura::Window* modal_container = new aura::Window(NULL); |
83 modal_container->SetEventFilter( | 87 modal_container->SetEventFilter( |
84 new ToplevelWindowEventFilter(modal_container)); | 88 new ToplevelWindowEventFilter(modal_container)); |
85 modal_container->SetLayoutManager( | 89 modal_container->SetLayoutManager( |
86 new internal::ModalContainerLayoutManager(modal_container)); | 90 new internal::ModalContainerLayoutManager(modal_container)); |
87 modal_container->set_id(internal::kShellWindowId_ModalContainer); | 91 modal_container->set_id(internal::kShellWindowId_ModalContainer); |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 new internal::WorkspaceController(default_container)); | 329 new internal::WorkspaceController(default_container)); |
326 workspace_controller_->SetLauncherModel(launcher_->model()); | 330 workspace_controller_->SetLauncherModel(launcher_->model()); |
327 default_container->SetEventFilter( | 331 default_container->SetEventFilter( |
328 new internal::DefaultContainerEventFilter(default_container)); | 332 new internal::DefaultContainerEventFilter(default_container)); |
329 default_container->SetLayoutManager( | 333 default_container->SetLayoutManager( |
330 new internal::DefaultContainerLayoutManager( | 334 new internal::DefaultContainerLayoutManager( |
331 workspace_controller_->workspace_manager())); | 335 workspace_controller_->workspace_manager())); |
332 } | 336 } |
333 | 337 |
334 } // namespace aura_shell | 338 } // namespace aura_shell |
OLD | NEW |