| 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 20075fc137261b980612e6eedcd174099e388378..a66f34b2311ec1b6bbf7fe955f00969da3456ec0 100644
|
| --- a/ui/app_list/views/app_list_view.cc
|
| +++ b/ui/app_list/views/app_list_view.cc
|
| @@ -50,8 +50,7 @@
|
|
|
| namespace {
|
|
|
| -// For UMA and testing. If non-null, triggered when the app list is painted.
|
| -base::Closure g_next_paint_callback;
|
| +void (*g_next_paint_callback)();
|
|
|
| // The margin from the edge to the speech UI.
|
| const int kSpeechUIMargin = 12;
|
| @@ -200,9 +199,9 @@
|
|
|
| void AppListView::Paint(gfx::Canvas* canvas) {
|
| views::BubbleDelegateView::Paint(canvas);
|
| - if (!g_next_paint_callback.is_null()) {
|
| - g_next_paint_callback.Run();
|
| - g_next_paint_callback.Reset();
|
| + if (g_next_paint_callback) {
|
| + g_next_paint_callback();
|
| + g_next_paint_callback = NULL;
|
| }
|
| }
|
|
|
| @@ -244,7 +243,7 @@
|
| }
|
|
|
| // static
|
| -void AppListView::SetNextPaintCallback(const base::Closure& callback) {
|
| +void AppListView::SetNextPaintCallback(void (*callback)()) {
|
| g_next_paint_callback = callback;
|
| }
|
|
|
|
|