ash/launcher/launcher_view.cc - Issue 23534023: ash: Minor cleanup, move more files from launcher to shelf.

Side by Side Diff: ash/launcher/launcher_view.cc

Issue 23534023: ash: Minor cleanup, move more files from launcher to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « ash/ash.gyp ('k') | ash/launcher/overflow_bubble.h » ('j') | no next file with comments »

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/launcher/launcher_view.h"	5 #include "ash/launcher/launcher_view.h"

6	6

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

8	8

9 #include "ash/ash_constants.h"	9 #include "ash/ash_constants.h"

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

11 #include "ash/drag_drop/drag_image_view.h"	11 #include "ash/drag_drop/drag_image_view.h"

12 #include "ash/launcher/launcher_button.h"	12 #include "ash/launcher/launcher_button.h"

13 #include "ash/launcher/launcher_delegate.h"	13 #include "ash/launcher/launcher_delegate.h"

14 #include "ash/launcher/launcher_icon_observer.h"	14 #include "ash/launcher/launcher_icon_observer.h"

15 #include "ash/launcher/launcher_item_delegate.h"	15 #include "ash/launcher/launcher_item_delegate.h"

16 #include "ash/launcher/launcher_item_delegate_manager.h"	16 #include "ash/launcher/launcher_item_delegate_manager.h"

17 #include "ash/launcher/launcher_model.h"	17 #include "ash/launcher/launcher_model.h"

18 #include "ash/launcher/launcher_tooltip_manager.h"	18 #include "ash/launcher/launcher_tooltip_manager.h"

19 #include "ash/launcher/overflow_bubble.h"

20 #include "ash/launcher/overflow_button.h"

21 #include "ash/root_window_controller.h"	19 #include "ash/root_window_controller.h"

22 #include "ash/scoped_target_root_window.h"	20 #include "ash/scoped_target_root_window.h"

23 #include "ash/shelf/alternate_app_list_button.h"	21 #include "ash/shelf/alternate_app_list_button.h"

24 #include "ash/shelf/app_list_button.h"	22 #include "ash/shelf/app_list_button.h"

	23 #include "ash/shelf/overflow_bubble.h"

	24 #include "ash/shelf/overflow_button.h"

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

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

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

28 #include "base/auto_reset.h"	28 #include "base/auto_reset.h"

29 #include "base/memory/scoped_ptr.h"	29 #include "base/memory/scoped_ptr.h"

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

31 #include "grit/ash_strings.h"	31 #include "grit/ash_strings.h"

32 #include "ui/aura/client/screen_position_client.h"	32 #include "ui/aura/client/screen_position_client.h"

33 #include "ui/aura/root_window.h"	33 #include "ui/aura/root_window.h"

34 #include "ui/aura/window.h"	34 #include "ui/aura/window.h"

(...skipping 1850 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1885 break;	1885 break;

1886 case ash::SHELF_ALIGNMENT_TOP:	1886 case ash::SHELF_ALIGNMENT_TOP:

1887 distance = coordinate.y() - bounds.bottom();	1887 distance = coordinate.y() - bounds.bottom();

1888 break;	1888 break;

1889 }	1889 }

1890 return distance > 0 ? distance : 0;	1890 return distance > 0 ? distance : 0;

1891 }	1891 }

1892	1892

1893 } // namespace internal	1893 } // namespace internal

1894 } // namespace ash	1894 } // namespace ash

OLD	NEW