| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 } | 191 } |
| 192 | 192 |
| 193 void AppListView::UpdateBounds() { | 193 void AppListView::UpdateBounds() { |
| 194 SizeToContents(); | 194 SizeToContents(); |
| 195 } | 195 } |
| 196 | 196 |
| 197 bool AppListView::ShouldCenterWindow() const { | 197 bool AppListView::ShouldCenterWindow() const { |
| 198 return delegate_->ShouldCenterWindow(); | 198 return delegate_->ShouldCenterWindow(); |
| 199 } | 199 } |
| 200 | 200 |
| 201 gfx::Size AppListView::GetPreferredSize() { | 201 gfx::Size AppListView::GetPreferredSize() const { |
| 202 return app_list_main_view_->GetPreferredSize(); | 202 return app_list_main_view_->GetPreferredSize(); |
| 203 } | 203 } |
| 204 | 204 |
| 205 void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { | 205 void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { |
| 206 views::BubbleDelegateView::Paint(canvas, cull_set); | 206 views::BubbleDelegateView::Paint(canvas, cull_set); |
| 207 if (!next_paint_callback_.is_null()) { | 207 if (!next_paint_callback_.is_null()) { |
| 208 next_paint_callback_.Run(); | 208 next_paint_callback_.Run(); |
| 209 next_paint_callback_.Reset(); | 209 next_paint_callback_.Reset(); |
| 210 } | 210 } |
| 211 } | 211 } |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 #else | 511 #else |
| 512 speech_view_->SetVisible(recognizing); | 512 speech_view_->SetVisible(recognizing); |
| 513 app_list_main_view_->SetVisible(!recognizing); | 513 app_list_main_view_->SetVisible(!recognizing); |
| 514 | 514 |
| 515 // Needs to schedule paint of AppListView itself, to repaint the background. | 515 // Needs to schedule paint of AppListView itself, to repaint the background. |
| 516 GetBubbleFrameView()->SchedulePaint(); | 516 GetBubbleFrameView()->SchedulePaint(); |
| 517 #endif | 517 #endif |
| 518 } | 518 } |
| 519 | 519 |
| 520 } // namespace app_list | 520 } // namespace app_list |
| OLD | NEW |