ash/common/shelf/shelf_widget.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

Side by Side Diff: ash/common/shelf/shelf_widget.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ash/common/shelf/shelf_widget.h ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »

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/common/shelf/shelf_widget.h"

6	6

7 #include "ash/common/focus_cycler.h"	7 #include "ash/common/focus_cycler.h"

8 #include "ash/common/material_design/material_design_controller.h"	8 #include "ash/common/material_design/material_design_controller.h"

9 #include "ash/common/session/session_state_delegate.h"	9 #include "ash/common/session/session_state_delegate.h"

10 #include "ash/common/shelf/shelf_background_animator_observer.h"	10 #include "ash/common/shelf/shelf_background_animator_observer.h"

11 #include "ash/common/shelf/shelf_constants.h"	11 #include "ash/common/shelf/shelf_constants.h"

12 #include "ash/common/shelf/shelf_delegate.h"	12 #include "ash/common/shelf/shelf_delegate.h"

	13 #include "ash/common/shelf/shelf_layout_manager.h"

13 #include "ash/common/shelf/shelf_view.h"	14 #include "ash/common/shelf/shelf_view.h"

14 #include "ash/common/shelf/wm_dimmer_view.h"	15 #include "ash/common/shelf/wm_dimmer_view.h"

15 #include "ash/common/shelf/wm_shelf.h"	16 #include "ash/common/shelf/wm_shelf.h"

16 #include "ash/common/shelf/wm_shelf_util.h"	17 #include "ash/common/shelf/wm_shelf_util.h"

	18 #include "ash/common/system/status_area_layout_manager.h"

17 #include "ash/common/system/status_area_widget.h"	19 #include "ash/common/system/status_area_widget.h"

18 #include "ash/common/system/tray/system_tray_delegate.h"	20 #include "ash/common/system/tray/system_tray_delegate.h"

19 #include "ash/common/wm_root_window_controller.h"	21 #include "ash/common/wm_root_window_controller.h"

20 #include "ash/common/wm_shell.h"	22 #include "ash/common/wm_shell.h"

21 #include "ash/common/wm_window.h"	23 #include "ash/common/wm_window.h"

22 #include "ash/shelf/shelf_layout_manager.h"

23 #include "ash/wm/status_area_layout_manager.h"

24 #include "base/memory/ptr_util.h"	24 #include "base/memory/ptr_util.h"

25 #include "grit/ash_resources.h"	25 #include "grit/ash_resources.h"

26 #include "ui/base/resource/resource_bundle.h"	26 #include "ui/base/resource/resource_bundle.h"

27 #include "ui/compositor/layer.h"	27 #include "ui/compositor/layer.h"

28 #include "ui/compositor/scoped_layer_animation_settings.h"	28 #include "ui/compositor/scoped_layer_animation_settings.h"

29 #include "ui/gfx/canvas.h"	29 #include "ui/gfx/canvas.h"

30 #include "ui/gfx/image/image.h"	30 #include "ui/gfx/image/image.h"

31 #include "ui/gfx/image/image_skia_operations.h"	31 #include "ui/gfx/image/image_skia_operations.h"

32 #include "ui/gfx/skbitmap_operations.h"	32 #include "ui/gfx/skbitmap_operations.h"

33 #include "ui/views/accessible_pane_view.h"	33 #include "ui/views/accessible_pane_view.h"

(...skipping 496 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
530 if (shelf_view_)	530 if (shelf_view_)

531 shelf_view_->UpdateShelfItemBackground(alpha);	531 shelf_view_->UpdateShelfItemBackground(alpha);

532 }	532 }

533	533

534 void ShelfWidget::WillDeleteShelfLayoutManager() {	534 void ShelfWidget::WillDeleteShelfLayoutManager() {

535 shelf_layout_manager_->RemoveObserver(this);	535 shelf_layout_manager_->RemoveObserver(this);

536 shelf_layout_manager_ = nullptr;	536 shelf_layout_manager_ = nullptr;

537 }	537 }

538	538

539 } // namespace ash	539 } // namespace ash

OLD	NEW