| 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" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "ui/gfx/path.h" | 30 #include "ui/gfx/path.h" |
| 31 #include "ui/gfx/skia_util.h" | 31 #include "ui/gfx/skia_util.h" |
| 32 #include "ui/views/bubble/bubble_frame_view.h" | 32 #include "ui/views/bubble/bubble_frame_view.h" |
| 33 #include "ui/views/bubble/bubble_window_targeter.h" | 33 #include "ui/views/bubble/bubble_window_targeter.h" |
| 34 #include "ui/views/controls/textfield/textfield.h" | 34 #include "ui/views/controls/textfield/textfield.h" |
| 35 #include "ui/views/layout/fill_layout.h" | 35 #include "ui/views/layout/fill_layout.h" |
| 36 #include "ui/views/widget/widget.h" | 36 #include "ui/views/widget/widget.h" |
| 37 | 37 |
| 38 #if defined(USE_AURA) | 38 #if defined(USE_AURA) |
| 39 #include "ui/aura/window.h" | 39 #include "ui/aura/window.h" |
| 40 #include "ui/aura/window_event_dispatcher.h" | 40 #include "ui/aura/window_tree_host.h" |
| 41 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
| 42 #include "ui/base/win/shell.h" | 42 #include "ui/base/win/shell.h" |
| 43 #endif | 43 #endif |
| 44 #if !defined(OS_CHROMEOS) | 44 #if !defined(OS_CHROMEOS) |
| 45 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 45 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 46 #endif | 46 #endif |
| 47 #endif // defined(USE_AURA) | 47 #endif // defined(USE_AURA) |
| 48 | 48 |
| 49 namespace app_list { | 49 namespace app_list { |
| 50 | 50 |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 #else | 503 #else |
| 504 speech_view_->SetVisible(recognizing); | 504 speech_view_->SetVisible(recognizing); |
| 505 app_list_main_view_->SetVisible(!recognizing); | 505 app_list_main_view_->SetVisible(!recognizing); |
| 506 | 506 |
| 507 // Needs to schedule paint of AppListView itself, to repaint the background. | 507 // Needs to schedule paint of AppListView itself, to repaint the background. |
| 508 GetBubbleFrameView()->SchedulePaint(); | 508 GetBubbleFrameView()->SchedulePaint(); |
| 509 #endif | 509 #endif |
| 510 } | 510 } |
| 511 | 511 |
| 512 } // namespace app_list | 512 } // namespace app_list |
| OLD | NEW |