ui/app_list/views/app_list_view.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

Side by Side Diff: ui/app_list/views/app_list_view.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « ui/app_list/demo/app_list_demo_views.cc ('k') | ui/app_list/views/contents_view.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 "ui/app_list/views/app_list_view.h"	5 #include "ui/app_list/views/app_list_view.h"

6	6

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

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/win/windows_version.h"	11 #include "base/win/windows_version.h"

12 #include "grit/ui_resources.h"

13 #include "ui/app_list/app_list_constants.h"	12 #include "ui/app_list/app_list_constants.h"

14 #include "ui/app_list/app_list_model.h"	13 #include "ui/app_list/app_list_model.h"

15 #include "ui/app_list/app_list_switches.h"	14 #include "ui/app_list/app_list_switches.h"

16 #include "ui/app_list/app_list_view_delegate.h"	15 #include "ui/app_list/app_list_view_delegate.h"

17 #include "ui/app_list/speech_ui_model.h"	16 #include "ui/app_list/speech_ui_model.h"

18 #include "ui/app_list/views/app_list_background.h"	17 #include "ui/app_list/views/app_list_background.h"

19 #include "ui/app_list/views/app_list_folder_view.h"	18 #include "ui/app_list/views/app_list_folder_view.h"

20 #include "ui/app_list/views/app_list_main_view.h"	19 #include "ui/app_list/views/app_list_main_view.h"

21 #include "ui/app_list/views/app_list_view_observer.h"	20 #include "ui/app_list/views/app_list_view_observer.h"

22 #include "ui/app_list/views/apps_container_view.h"	21 #include "ui/app_list/views/apps_container_view.h"

23 #include "ui/app_list/views/contents_view.h"	22 #include "ui/app_list/views/contents_view.h"

24 #include "ui/app_list/views/search_box_view.h"	23 #include "ui/app_list/views/search_box_view.h"

25 #include "ui/app_list/views/speech_view.h"	24 #include "ui/app_list/views/speech_view.h"

26 #include "ui/app_list/views/start_page_view.h"	25 #include "ui/app_list/views/start_page_view.h"

27 #include "ui/base/ui_base_switches.h"	26 #include "ui/base/ui_base_switches.h"

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

29 #include "ui/compositor/layer_animation_observer.h"	28 #include "ui/compositor/layer_animation_observer.h"

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

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

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

33 #include "ui/gfx/insets.h"	32 #include "ui/gfx/insets.h"

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

35 #include "ui/gfx/skia_util.h"	34 #include "ui/gfx/skia_util.h"

	35 #include "ui/resources/grit/ui_resources.h"

36 #include "ui/views/bubble/bubble_frame_view.h"	36 #include "ui/views/bubble/bubble_frame_view.h"

37 #include "ui/views/controls/image_view.h"	37 #include "ui/views/controls/image_view.h"

38 #include "ui/views/controls/textfield/textfield.h"	38 #include "ui/views/controls/textfield/textfield.h"

39 #include "ui/views/layout/fill_layout.h"	39 #include "ui/views/layout/fill_layout.h"

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

41	41

42 #if defined(USE_AURA)	42 #if defined(USE_AURA)

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

44 #include "ui/aura/window_tree_host.h"	44 #include "ui/aura/window_tree_host.h"

45 #include "ui/views/bubble/bubble_window_targeter.h"	45 #include "ui/views/bubble/bubble_window_targeter.h"

(...skipping 538 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
584 speech_view_->layer()->SetTransform(speech_transform);	584 speech_view_->layer()->SetTransform(speech_transform);

585 }	585 }

586	586

587 if (will_appear)	587 if (will_appear)

588 speech_view_->SetVisible(true);	588 speech_view_->SetVisible(true);

589 else	589 else

590 app_list_main_view_->SetVisible(true);	590 app_list_main_view_->SetVisible(true);

591 }	591 }

592	592

593 } // namespace app_list	593 } // namespace app_list

OLD	NEW