Turn Message Center Menus Async

ui/message_center/views/notifier_settings_view.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/views/notifier_settings_view.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 18 matching lines @@
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
+#include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
@@ skipping 627 matching lines @@
 
   (*iter)->SetChecked(!(*iter)->checked());
   if (provider_)
     provider_->SetNotifierEnabled((*iter)->notifier(), (*iter)->checked());
 }
 
 void NotifierSettingsView::OnMenuButtonClicked(views::MenuButton* source,
                                                const gfx::Point& point,
                                                const ui::Event* event) {
   notifier_group_menu_model_.reset(new NotifierGroupMenuModel(provider_));
+  notifier_group_menu_model_adapter_.reset(new views::MenuModelAdapter(
+      notifier_group_menu_model_.get(),
+      base::Bind(&NotifierSettingsView::OnMenuClosed, base::Unretained(this))));
+
   notifier_group_menu_runner_.reset(new views::MenuRunner(
-      notifier_group_menu_model_.get(), views::MenuRunner::CONTEXT_MENU));
+      notifier_group_menu_model_adapter_->CreateMenu(),
+      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::ASYNC));
   gfx::Rect menu_anchor = source->GetBoundsInScreen();
   menu_anchor.Inset(
       gfx::Insets(0, kMenuWhitespaceOffset, 0, kMenuWhitespaceOffset));
-  if (views::MenuRunner::MENU_DELETED ==
-      notifier_group_menu_runner_->RunMenuAt(GetWidget(),
-                                             notifier_group_selector_,
-                                             menu_anchor,
-                                             views::MENU_ANCHOR_BUBBLE_ABOVE,
-                                             ui::MENU_SOURCE_MOUSE))
-    return;
+  notifier_group_menu_runner_->RunMenuAt(
+      GetWidget(), notifier_group_selector_, menu_anchor,
+      views::MENU_ANCHOR_BUBBLE_ABOVE, ui::MENU_SOURCE_MOUSE);
+}
+
+void NotifierSettingsView::OnMenuClosed() {
   MessageCenterView* center_view = static_cast<MessageCenterView*>(parent());
   center_view->OnSettingsChanged();
+
+  notifier_group_menu_runner_.reset();
+  notifier_group_menu_model_adapter_.reset();
+  notifier_group_menu_model_.reset();
 }
 
 }  // namespace message_center