ash/launcher/launcher_view.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

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

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix DEPS Created 8 years, 7 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/launcher/launcher_context_menu_unittest.cc ('k') | ash/launcher/launcher_view_unittest.cc » ('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 "ash/launcher/launcher_button.h"	7 #include "ash/launcher/launcher_button.h"

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

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

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

11 #include "ash/launcher/tabbed_launcher_button.h"	11 #include "ash/launcher/tabbed_launcher_button.h"

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

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

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

15 #include "base/utf_string_conversions.h"	15 #include "base/utf_string_conversions.h"

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

17 #include "grit/ui_resources.h"	17 #include "grit/ui_resources.h"

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

19 #include "ui/base/animation/animation.h"	19 #include "ui/base/animation/animation.h"

20 #include "ui/base/animation/throb_animation.h"	20 #include "ui/base/animation/throb_animation.h"

21 #include "ui/base/l10n/l10n_util.h"	21 #include "ui/base/l10n/l10n_util.h"

22 #include "ui/base/models/simple_menu_model.h"	22 #include "ui/base/models/simple_menu_model.h"

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

24 #include "ui/gfx/compositor/layer.h"	24 #include "ui/compositor/layer.h"

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

26 #include "ui/views/animation/bounds_animator.h"	26 #include "ui/views/animation/bounds_animator.h"

27 #include "ui/views/controls/button/image_button.h"	27 #include "ui/views/controls/button/image_button.h"

28 #include "ui/views/controls/menu/menu_model_adapter.h"	28 #include "ui/views/controls/menu/menu_model_adapter.h"

29 #include "ui/views/controls/menu/menu_runner.h"	29 #include "ui/views/controls/menu/menu_runner.h"

30 #include "ui/views/focus/focus_search.h"	30 #include "ui/views/focus/focus_search.h"

31 #include "ui/views/view_model.h"	31 #include "ui/views/view_model.h"

32 #include "ui/views/view_model_utils.h"	32 #include "ui/views/view_model_utils.h"

33 #include "ui/views/widget/root_view.h"	33 #include "ui/views/widget/root_view.h"

34 #include "ui/views/widget/widget.h"	34 #include "ui/views/widget/widget.h"

(...skipping 867 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
902 source->GetWidget(), NULL, gfx::Rect(point, gfx::Size()),	902 source->GetWidget(), NULL, gfx::Rect(point, gfx::Size()),

903 views::MenuItemView::TOPLEFT, 0) == views::MenuRunner::MENU_DELETED)	903 views::MenuItemView::TOPLEFT, 0) == views::MenuRunner::MENU_DELETED)

904 return;	904 return;

905	905

906 Shell::GetInstance()->UpdateShelfVisibility();	906 Shell::GetInstance()->UpdateShelfVisibility();

907 #endif	907 #endif

908 }	908 }

909	909

910 } // namespace internal	910 } // namespace internal

911 } // namespace ash	911 } // namespace ash

OLD	NEW