views/bookmarks: Convert BookmarkEditorView from Menu2 API to MenuModelApdater/MenuRunner API.

chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/controls/menu/menu_2.h"
+#include "ui/views/controls/menu/menu_model_adapter.h"
+#include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using views::GridLayout;
 
 namespace {
@@ skipping 240 matching lines @@
 }
 
 void BookmarkEditorView::ShowContextMenuForView(views::View* source,
                                                 const gfx::Point& point) {
   DCHECK(source == tree_view_);
   if (!tree_view_->GetSelectedNode())
     return;
   running_menu_for_root_ =
       (tree_model_->GetParent(tree_view_->GetSelectedNode()) ==
        tree_model_->GetRoot());
-#if defined(USE_AURA)
-  NOTIMPLEMENTED();
-#else
-  if (!context_menu_contents_.get()) {
-    context_menu_contents_.reset(new ui::SimpleMenuModel(this));
-    context_menu_contents_->AddItemWithStringId(IDS_EDIT, IDS_EDIT);
-    context_menu_contents_->AddItemWithStringId(IDS_DELETE, IDS_DELETE);
-    context_menu_contents_->AddItemWithStringId(
-        IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM,
-        IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
-    context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
-  }
-  context_menu_->RunContextMenuAt(point);
-#endif
+
+  views::MenuModelAdapter adapter(GetMenuModel());
+  context_menu_runner_.reset(new views::MenuRunner(adapter.CreateMenu()));
+
+  if (context_menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
+        NULL, gfx::Rect(point, gfx::Size()), views::MenuItemView::TOPRIGHT,
+        views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
+    return;
 }
 
 void BookmarkEditorView::Init() {
   bb_model_ = profile_->GetBookmarkModel();
   DCHECK(bb_model_);
   bb_model_->AddObserver(this);
 
   title_tf_.set_parent_owned(false);
 
   string16 title;
@@ skipping 146 matching lines @@
   // Do this first, otherwise when we invoke SetModel with the real one
   // tree_view will try to invoke something on the model we just deleted.
   tree_view_->SetModel(NULL);
 
   EditorNode* root_node = CreateRootNode();
   tree_model_.reset(new EditorTreeModel(root_node));
 
   tree_view_->SetModel(tree_model_.get());
   tree_view_->SetController(this);
 
-#if !defined(USE_AURA)
-  context_menu_.reset();
-#endif
+  context_menu_runner_.reset();
 
   if (parent())
     ExpandAndSelect();
 }
 
 GURL BookmarkEditorView::GetInputURL() const {
   if (details_.GetNodeType() == BookmarkNode::FOLDER)
     return GURL();
   return URLFixerUpper::FixupURL(UTF16ToUTF8(url_tf_->text()), std::string());
 }
@@ skipping 179 matching lines @@
     BookmarkExpandedStateTracker::Nodes* expanded_nodes) {
   if (!tree_view_->IsExpanded(editor_node))
     return;
 
   if (editor_node->value != 0)  // The root is 0
     expanded_nodes->insert(bb_model_->GetNodeByID(editor_node->value));
   for (int i = 0; i < editor_node->child_count(); ++i)
     UpdateExpandedNodes(editor_node->GetChild(i), expanded_nodes);
 }
 
+ui::SimpleMenuModel* BookmarkEditorView::GetMenuModel() {
+  if (!context_menu_model_.get()) {
+    context_menu_model_.reset(new ui::SimpleMenuModel(this));
+    context_menu_model_->AddItemWithStringId(IDS_EDIT, IDS_EDIT);
+    context_menu_model_->AddItemWithStringId(IDS_DELETE, IDS_DELETE);
+    context_menu_model_->AddItemWithStringId(
+        IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM,
+        IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
+  }
+  return context_menu_model_.get();
+}
+
 void BookmarkEditorView::EditorTreeModel::SetTitle(ui::TreeModelNode* node,
                                                    const string16& title) {
   if (!title.empty())
     ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
 }