ash/shelf/shelf.cc - Issue 512663002: Cleanup: Remove misc unneeded grit includes.

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

Issue 512663002: Cleanup: Remove misc unneeded grit includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/frame/default_header_painter_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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.h"	5 #include "ash/shelf/shelf.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <cmath>	8 #include <cmath>

9	9

10 #include "ash/focus_cycler.h"	10 #include "ash/focus_cycler.h"

11 #include "ash/root_window_controller.h"	11 #include "ash/root_window_controller.h"

12 #include "ash/screen_util.h"	12 #include "ash/screen_util.h"

13 #include "ash/shelf/shelf_delegate.h"	13 #include "ash/shelf/shelf_delegate.h"

14 #include "ash/shelf/shelf_item_delegate.h"	14 #include "ash/shelf/shelf_item_delegate.h"

15 #include "ash/shelf/shelf_item_delegate_manager.h"	15 #include "ash/shelf/shelf_item_delegate_manager.h"

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

17 #include "ash/shelf/shelf_model.h"	17 #include "ash/shelf/shelf_model.h"

18 #include "ash/shelf/shelf_navigator.h"	18 #include "ash/shelf/shelf_navigator.h"

19 #include "ash/shelf/shelf_util.h"	19 #include "ash/shelf/shelf_util.h"

20 #include "ash/shelf/shelf_view.h"	20 #include "ash/shelf/shelf_view.h"

21 #include "ash/shelf/shelf_widget.h"	21 #include "ash/shelf/shelf_widget.h"

22 #include "ash/shell.h"	22 #include "ash/shell.h"

23 #include "ash/shell_delegate.h"	23 #include "ash/shell_delegate.h"

24 #include "ash/shell_window_ids.h"	24 #include "ash/shell_window_ids.h"

25 #include "ash/wm/window_properties.h"	25 #include "ash/wm/window_properties.h"

26 #include "grit/ash_resources.h"

27 #include "ui/aura/window.h"	26 #include "ui/aura/window.h"

28 #include "ui/aura/window_event_dispatcher.h"	27 #include "ui/aura/window_event_dispatcher.h"

29 #include "ui/aura/window_observer.h"	28 #include "ui/aura/window_observer.h"

30 #include "ui/compositor/layer.h"	29 #include "ui/compositor/layer.h"

31 #include "ui/gfx/canvas.h"	30 #include "ui/gfx/canvas.h"

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

33 #include "ui/gfx/image/image_skia_operations.h"	32 #include "ui/gfx/image/image_skia_operations.h"

34 #include "ui/gfx/skbitmap_operations.h"	33 #include "ui/gfx/skbitmap_operations.h"

35 #include "ui/views/accessible_pane_view.h"	34 #include "ui/views/accessible_pane_view.h"

36 #include "ui/views/widget/widget.h"	35 #include "ui/views/widget/widget.h"

(...skipping 150 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187	186

188 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {	187 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {

189 return shelf_view_->GetVisibleItemsBoundsInScreen();	188 return shelf_view_->GetVisibleItemsBoundsInScreen();

190 }	189 }

191	190

192 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {	191 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {

193 return shelf_view_;	192 return shelf_view_;

194 }	193 }

195	194

196 } // namespace ash	195 } // namespace ash

OLD	NEW