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 "ui/app_list/app_list_constants.h" | 12 #include "ui/app_list/app_list_constants.h" |
13 #include "ui/app_list/app_list_model.h" | 13 #include "ui/app_list/app_list_model.h" |
14 #include "ui/app_list/app_list_view_delegate.h" | 14 #include "ui/app_list/app_list_view_delegate.h" |
15 #include "ui/app_list/pagination_model.h" | 15 #include "ui/app_list/pagination_model.h" |
16 #include "ui/app_list/signin_delegate.h" | 16 #include "ui/app_list/signin_delegate.h" |
17 #include "ui/app_list/speech_ui_model.h" | 17 #include "ui/app_list/speech_ui_model.h" |
18 #include "ui/app_list/views/app_list_background.h" | 18 #include "ui/app_list/views/app_list_background.h" |
19 #include "ui/app_list/views/app_list_main_view.h" | 19 #include "ui/app_list/views/app_list_main_view.h" |
20 #include "ui/app_list/views/app_list_view_observer.h" | 20 #include "ui/app_list/views/app_list_view_observer.h" |
21 #include "ui/app_list/views/search_box_view.h" | 21 #include "ui/app_list/views/search_box_view.h" |
22 #include "ui/app_list/views/signin_view.h" | 22 #include "ui/app_list/views/signin_view.h" |
23 #include "ui/app_list/views/speech_view.h" | 23 #include "ui/app_list/views/speech_view.h" |
24 #include "ui/base/ui_base_switches.h" | 24 #include "ui/base/ui_base_switches.h" |
25 #include "ui/compositor/layer.h" | 25 #include "ui/compositor/layer.h" |
| 26 #include "ui/compositor/layer_animation_observer.h" |
26 #include "ui/compositor/scoped_layer_animation_settings.h" | 27 #include "ui/compositor/scoped_layer_animation_settings.h" |
27 #include "ui/gfx/image/image_skia.h" | 28 #include "ui/gfx/image/image_skia.h" |
28 #include "ui/gfx/insets.h" | 29 #include "ui/gfx/insets.h" |
29 #include "ui/gfx/path.h" | 30 #include "ui/gfx/path.h" |
30 #include "ui/gfx/skia_util.h" | 31 #include "ui/gfx/skia_util.h" |
31 #include "ui/views/bubble/bubble_frame_view.h" | 32 #include "ui/views/bubble/bubble_frame_view.h" |
32 #include "ui/views/bubble/bubble_window_targeter.h" | 33 #include "ui/views/bubble/bubble_window_targeter.h" |
33 #include "ui/views/controls/textfield/textfield.h" | 34 #include "ui/views/controls/textfield/textfield.h" |
34 #include "ui/views/layout/fill_layout.h" | 35 #include "ui/views/layout/fill_layout.h" |
35 #include "ui/views/widget/widget.h" | 36 #include "ui/views/widget/widget.h" |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 #else | 497 #else |
497 speech_view_->SetVisible(recognizing); | 498 speech_view_->SetVisible(recognizing); |
498 app_list_main_view_->SetVisible(!recognizing); | 499 app_list_main_view_->SetVisible(!recognizing); |
499 | 500 |
500 // Needs to schedule paint of AppListView itself, to repaint the background. | 501 // Needs to schedule paint of AppListView itself, to repaint the background. |
501 GetBubbleFrameView()->SchedulePaint(); | 502 GetBubbleFrameView()->SchedulePaint(); |
502 #endif | 503 #endif |
503 } | 504 } |
504 | 505 |
505 } // namespace app_list | 506 } // namespace app_list |
OLD | NEW |