Make back forward menu model a MenuModel....

chrome/browser/chromeos/compact_navigation_bar.cc

 // Copyright (c) 2009 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/chromeos/compact_navigation_bar.h"
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/logging.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
-#include "chrome/browser/back_forward_menu_model_views.h"
+#include "chrome/browser/back_forward_menu_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/status_area_view.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/event_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 33 matching lines @@
     location_entry_view_->Detach();
 }
 
 void CompactNavigationBar::Init() {
   DCHECK(!initialized_);
   initialized_ = true;
 
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
 
-  back_menu_model_.reset(new BackForwardMenuModelViews(
-      browser_, BackForwardMenuModel::BACKWARD_MENU, GetWidget()));
-  forward_menu_model_.reset(new BackForwardMenuModelViews(
-      browser_, BackForwardMenuModel::FORWARD_MENU, GetWidget()));
+  back_menu_model_.reset(new BackForwardMenuModel(
+      browser_, BackForwardMenuModel::BACKWARD_MENU));
+  forward_menu_model_.reset(new BackForwardMenuModel(
+      browser_, BackForwardMenuModel::FORWARD_MENU));
 
   ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
 
   back_ = new views::ButtonDropDown(this, back_menu_model_.get());
   back_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
                                      views::Event::EF_MIDDLE_BUTTON_DOWN);
   back_->set_tag(IDC_BACK);
   back_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_BACK));
   back_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_BACK));
   back_->SetImage(views::CustomButton::BS_NORMAL,
@@ skipping 221 matching lines @@
       break;
     }
     case StatusAreaView::OPEN_TABS_ON_RIGHT: {
       browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
       break;
     }
   }
 }
 
 }  // namespace chromeos