| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/shelf/shelf_widget.h" | 5 #include "ash/shelf/shelf_widget.h" |
| 6 | 6 |
| 7 #include "ash/animation/animation_change_type.h" | 7 #include "ash/animation/animation_change_type.h" |
| 8 #include "ash/focus_cycler.h" | 8 #include "ash/focus_cycler.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/session/session_controller.h" | 10 #include "ash/session/session_controller.h" |
| 11 #include "ash/shelf/app_list_button.h" | 11 #include "ash/shelf/app_list_button.h" |
| 12 #include "ash/shelf/shelf_background_animator_observer.h" | 12 #include "ash/shelf/shelf_background_animator_observer.h" |
| 13 #include "ash/shelf/shelf_constants.h" | 13 #include "ash/shelf/shelf_constants.h" |
| 14 #include "ash/shelf/shelf_layout_manager.h" | 14 #include "ash/shelf/shelf_layout_manager.h" |
| 15 #include "ash/shelf/shelf_view.h" | 15 #include "ash/shelf/shelf_view.h" |
| 16 #include "ash/shelf/wm_shelf.h" | 16 #include "ash/shelf/wm_shelf.h" |
| 17 #include "ash/shelf/wm_shelf_util.h" | |
| 18 #include "ash/shell.h" | 17 #include "ash/shell.h" |
| 19 #include "ash/system/status_area_layout_manager.h" | 18 #include "ash/system/status_area_layout_manager.h" |
| 20 #include "ash/system/status_area_widget.h" | 19 #include "ash/system/status_area_widget.h" |
| 21 #include "ash/wm/window_properties.h" | 20 #include "ash/wm/window_properties.h" |
| 22 #include "ash/wm_window.h" | 21 #include "ash/wm_window.h" |
| 23 #include "base/memory/ptr_util.h" | 22 #include "base/memory/ptr_util.h" |
| 24 #include "ui/compositor/layer.h" | 23 #include "ui/compositor/layer.h" |
| 25 #include "ui/compositor/scoped_layer_animation_settings.h" | 24 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 26 #include "ui/gfx/skbitmap_operations.h" | 25 #include "ui/gfx/skbitmap_operations.h" |
| 27 #include "ui/views/accessible_pane_view.h" | 26 #include "ui/views/accessible_pane_view.h" |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 if (shelf_view_) | 346 if (shelf_view_) |
| 348 shelf_view_->UpdateShelfItemBackground(color); | 347 shelf_view_->UpdateShelfItemBackground(color); |
| 349 } | 348 } |
| 350 | 349 |
| 351 void ShelfWidget::WillDeleteShelfLayoutManager() { | 350 void ShelfWidget::WillDeleteShelfLayoutManager() { |
| 352 shelf_layout_manager_->RemoveObserver(this); | 351 shelf_layout_manager_->RemoveObserver(this); |
| 353 shelf_layout_manager_ = nullptr; | 352 shelf_layout_manager_ = nullptr; |
| 354 } | 353 } |
| 355 | 354 |
| 356 } // namespace ash | 355 } // namespace ash |
| OLD | NEW |