| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 } | 197 } |
| 198 | 198 |
| 199 bool AppListView::ShouldCenterWindow() const { | 199 bool AppListView::ShouldCenterWindow() const { |
| 200 return delegate_->ShouldCenterWindow(); | 200 return delegate_->ShouldCenterWindow(); |
| 201 } | 201 } |
| 202 | 202 |
| 203 gfx::Size AppListView::GetPreferredSize() { | 203 gfx::Size AppListView::GetPreferredSize() { |
| 204 return app_list_main_view_->GetPreferredSize(); | 204 return app_list_main_view_->GetPreferredSize(); |
| 205 } | 205 } |
| 206 | 206 |
| 207 void AppListView::Paint(gfx::Canvas* canvas) { | 207 void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { |
| 208 views::BubbleDelegateView::Paint(canvas); | 208 views::BubbleDelegateView::Paint(canvas, cull_set); |
| 209 if (g_next_paint_callback) { | 209 if (g_next_paint_callback) { |
| 210 g_next_paint_callback(); | 210 g_next_paint_callback(); |
| 211 g_next_paint_callback = NULL; | 211 g_next_paint_callback = NULL; |
| 212 } | 212 } |
| 213 } | 213 } |
| 214 | 214 |
| 215 void AppListView::OnThemeChanged() { | 215 void AppListView::OnThemeChanged() { |
| 216 #if defined(OS_WIN) | 216 #if defined(OS_WIN) |
| 217 GetWidget()->Close(); | 217 GetWidget()->Close(); |
| 218 #endif | 218 #endif |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 #else | 513 #else |
| 514 speech_view_->SetVisible(recognizing); | 514 speech_view_->SetVisible(recognizing); |
| 515 app_list_main_view_->SetVisible(!recognizing); | 515 app_list_main_view_->SetVisible(!recognizing); |
| 516 | 516 |
| 517 // Needs to schedule paint of AppListView itself, to repaint the background. | 517 // Needs to schedule paint of AppListView itself, to repaint the background. |
| 518 GetBubbleFrameView()->SchedulePaint(); | 518 GetBubbleFrameView()->SchedulePaint(); |
| 519 #endif | 519 #endif |
| 520 } | 520 } |
| 521 | 521 |
| 522 } // namespace app_list | 522 } // namespace app_list |
| OLD | NEW |