| 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 177 |
| 178 void AppListView::SetDragAndDropHostOfCurrentAppList( | 178 void AppListView::SetDragAndDropHostOfCurrentAppList( |
| 179 ApplicationDragAndDropHost* drag_and_drop_host) { | 179 ApplicationDragAndDropHost* drag_and_drop_host) { |
| 180 app_list_main_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host); | 180 app_list_main_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host); |
| 181 } | 181 } |
| 182 | 182 |
| 183 void AppListView::ShowWhenReady() { | 183 void AppListView::ShowWhenReady() { |
| 184 app_list_main_view_->ShowAppListWhenReady(); | 184 app_list_main_view_->ShowAppListWhenReady(); |
| 185 } | 185 } |
| 186 | 186 |
| 187 void AppListView::ResetForShow() { app_list_main_view_->ResetForShow(); } |
| 188 |
| 187 void AppListView::Close() { | 189 void AppListView::Close() { |
| 188 app_list_main_view_->Close(); | 190 app_list_main_view_->Close(); |
| 189 delegate_->Dismiss(); | 191 delegate_->Dismiss(); |
| 190 } | 192 } |
| 191 | 193 |
| 192 void AppListView::UpdateBounds() { | 194 void AppListView::UpdateBounds() { |
| 193 SizeToContents(); | 195 SizeToContents(); |
| 194 } | 196 } |
| 195 | 197 |
| 196 gfx::Size AppListView::GetPreferredSize() { | 198 gfx::Size AppListView::GetPreferredSize() { |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 #else | 499 #else |
| 498 speech_view_->SetVisible(recognizing); | 500 speech_view_->SetVisible(recognizing); |
| 499 app_list_main_view_->SetVisible(!recognizing); | 501 app_list_main_view_->SetVisible(!recognizing); |
| 500 | 502 |
| 501 // Needs to schedule paint of AppListView itself, to repaint the background. | 503 // Needs to schedule paint of AppListView itself, to repaint the background. |
| 502 GetBubbleFrameView()->SchedulePaint(); | 504 GetBubbleFrameView()->SchedulePaint(); |
| 503 #endif | 505 #endif |
| 504 } | 506 } |
| 505 | 507 |
| 506 } // namespace app_list | 508 } // namespace app_list |
| OLD | NEW |