| Index: ui/app_list/views/app_list_view.cc
|
| diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
|
| index a7f607da5e433d6c42f89ad864613cc947c1310c..0c5c5f705315148f3f60a75e5daf9dd48bb70075 100644
|
| --- a/ui/app_list/views/app_list_view.cc
|
| +++ b/ui/app_list/views/app_list_view.cc
|
| @@ -53,6 +53,8 @@
|
|
|
| namespace {
|
|
|
| +void (*g_next_paint_callback)();
|
| +
|
| // The margin from the edge to the speech UI.
|
| const int kSpeechUIMargin = 12;
|
|
|
| @@ -204,9 +206,9 @@
|
|
|
| void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) {
|
| views::BubbleDelegateView::Paint(canvas, cull_set);
|
| - if (!next_paint_callback_.is_null()) {
|
| - next_paint_callback_.Run();
|
| - next_paint_callback_.Reset();
|
| + if (g_next_paint_callback) {
|
| + g_next_paint_callback();
|
| + g_next_paint_callback = NULL;
|
| }
|
| }
|
|
|
| @@ -248,8 +250,8 @@
|
| }
|
|
|
| // static
|
| -void AppListView::SetNextPaintCallback(const base::Closure& callback) {
|
| - next_paint_callback_ = callback;
|
| +void AppListView::SetNextPaintCallback(void (*callback)()) {
|
| + g_next_paint_callback = callback;
|
| }
|
|
|
| #if defined(OS_WIN)
|
|
|