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" |
| 11 #include "ash/accelerators/nested_dispatcher_controller.h" |
11 #include "ash/app_list/app_list.h" | 12 #include "ash/app_list/app_list.h" |
12 #include "ash/ash_switches.h" | 13 #include "ash/ash_switches.h" |
13 #include "ash/drag_drop/drag_drop_controller.h" | 14 #include "ash/drag_drop/drag_drop_controller.h" |
14 #include "ash/ime/input_method_event_filter.h" | 15 #include "ash/ime/input_method_event_filter.h" |
15 #include "ash/launcher/launcher.h" | 16 #include "ash/launcher/launcher.h" |
16 #include "ash/shell_delegate.h" | 17 #include "ash/shell_delegate.h" |
17 #include "ash/shell_factory.h" | 18 #include "ash/shell_factory.h" |
18 #include "ash/shell_window_ids.h" | 19 #include "ash/shell_window_ids.h" |
19 #include "ash/tooltips/tooltip_controller.h" | 20 #include "ash/tooltips/tooltip_controller.h" |
20 #include "ash/wm/activation_controller.h" | 21 #include "ash/wm/activation_controller.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 } // namespace | 165 } // namespace |
165 | 166 |
166 // static | 167 // static |
167 Shell* Shell::instance_ = NULL; | 168 Shell* Shell::instance_ = NULL; |
168 | 169 |
169 //////////////////////////////////////////////////////////////////////////////// | 170 //////////////////////////////////////////////////////////////////////////////// |
170 // Shell, public: | 171 // Shell, public: |
171 | 172 |
172 Shell::Shell(ShellDelegate* delegate) | 173 Shell::Shell(ShellDelegate* delegate) |
173 : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)), | 174 : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)), |
| 175 nested_dispatcher_controller_(new NestedDispatcherController), |
174 accelerator_controller_(new AcceleratorController), | 176 accelerator_controller_(new AcceleratorController), |
175 delegate_(delegate), | 177 delegate_(delegate), |
176 window_mode_(NORMAL_MODE), | 178 window_mode_(NORMAL_MODE), |
177 root_window_layout_(NULL), | 179 root_window_layout_(NULL), |
178 status_widget_(NULL) { | 180 status_widget_(NULL) { |
179 aura::RootWindow::GetInstance()->SetEventFilter( | 181 aura::RootWindow::GetInstance()->SetEventFilter( |
180 new internal::RootWindowEventFilter); | 182 new internal::RootWindowEventFilter); |
181 } | 183 } |
182 | 184 |
183 Shell::~Shell() { | 185 Shell::~Shell() { |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 | 513 |
512 // Create the desktop background image. | 514 // Create the desktop background image. |
513 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); | 515 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); |
514 } | 516 } |
515 | 517 |
516 void Shell::ResetLayoutManager(int container_id) { | 518 void Shell::ResetLayoutManager(int container_id) { |
517 GetContainer(container_id)->SetLayoutManager(NULL); | 519 GetContainer(container_id)->SetLayoutManager(NULL); |
518 } | 520 } |
519 | 521 |
520 } // namespace ash | 522 } // namespace ash |
OLD | NEW |