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/app_list/app_list.h" | 9 #include "ash/app_list/app_list.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
567 while (!root_window->children().empty()) { | 567 while (!root_window->children().empty()) { |
568 aura::Window* child = root_window->children()[0]; | 568 aura::Window* child = root_window->children()[0]; |
569 delete child; | 569 delete child; |
570 } | 570 } |
571 | 571 |
572 // These need a valid Shell instance to clean up properly, so explicitly | 572 // These need a valid Shell instance to clean up properly, so explicitly |
573 // delete them before invalidating the instance. | 573 // delete them before invalidating the instance. |
574 // Alphabetical. | 574 // Alphabetical. |
575 activation_controller_.reset(); | 575 activation_controller_.reset(); |
576 drag_drop_controller_.reset(); | 576 drag_drop_controller_.reset(); |
| 577 event_client_.reset(); |
577 magnification_controller_.reset(); | 578 magnification_controller_.reset(); |
| 579 monitor_controller_.reset(); |
| 580 power_button_controller_.reset(); |
578 resize_shadow_controller_.reset(); | 581 resize_shadow_controller_.reset(); |
579 screen_dimmer_.reset(); | 582 screen_dimmer_.reset(); |
580 shadow_controller_.reset(); | 583 shadow_controller_.reset(); |
| 584 tooltip_controller_.reset(); |
581 window_cycle_controller_.reset(); | 585 window_cycle_controller_.reset(); |
582 event_client_.reset(); | |
583 monitor_controller_.reset(); | |
584 tooltip_controller_.reset(); | |
585 | 586 |
586 // Launcher widget has a InputMethodBridge that references to | 587 // Launcher widget has a InputMethodBridge that references to |
587 // input_method_filter_'s input_method_. So explicitly release launcher_ | 588 // input_method_filter_'s input_method_. So explicitly release launcher_ |
588 // before input_method_filter_. And this needs to be after we delete all | 589 // before input_method_filter_. And this needs to be after we delete all |
589 // containers in case there are still live browser windows which access | 590 // containers in case there are still live browser windows which access |
590 // LauncherModel during close. | 591 // LauncherModel during close. |
591 launcher_.reset(); | 592 launcher_.reset(); |
592 | 593 |
593 DCHECK(instance_ == this); | 594 DCHECK(instance_ == this); |
594 instance_ = NULL; | 595 instance_ = NULL; |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
917 panel_container->SetLayoutManager(panel_layout_manager_); | 918 panel_container->SetLayoutManager(panel_layout_manager_); |
918 } | 919 } |
919 } | 920 } |
920 | 921 |
921 void Shell::DisableWorkspaceGridLayout() { | 922 void Shell::DisableWorkspaceGridLayout() { |
922 if (workspace_controller_.get()) | 923 if (workspace_controller_.get()) |
923 workspace_controller_->workspace_manager()->set_grid_size(0); | 924 workspace_controller_->workspace_manager()->set_grid_size(0); |
924 } | 925 } |
925 | 926 |
926 } // namespace ash | 927 } // namespace ash |
OLD | NEW |