Allow the Views Delegate to provide the native widget.

chrome/browser/ui/views/menu_model_adapter_test.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 "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/test/test_views_delegate.h"
-#include "ui/views/views_delegate.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const int kTopMenuBaseId = 100;
 const int kSubMenuBaseId = 200;
 
-// ViewsDelegate::GetDispositionForEvent() is used by views::MenuModelAdapter.
-class TestViewsDelegate : public views::ViewsDelegate {
- public:
-  TestViewsDelegate() {
-  }
-
-  ~TestViewsDelegate() {
-  }
-
-  // views::ViewsDelegate implementation
-  virtual void SaveWindowPlacement(const views::Widget* widget,
-                                   const std::string& window_name,
-                                   const gfx::Rect& bounds,
-                                   ui::WindowShowState show_state) OVERRIDE {
-  }
-
-  virtual bool GetSavedWindowPlacement(
-      const std::string& window_name,
-      gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const OVERRIDE {
-    return false;
-  }
-
-  virtual void NotifyAccessibilityEvent(
-      views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {
-  }
-
-  virtual void NotifyMenuItemFocused(const string16& menu_name,
-                                     const string16& menu_item_name,
-                                     int item_index,
-                                     int item_count,
-                                     bool has_submenu) OVERRIDE {
-  }
-
-#if defined(OS_WIN)
-  virtual HICON GetDefaultWindowIcon() const OVERRIDE {
-    return NULL;
-  }
-#endif
-  virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
-      views::Widget* widget) OVERRIDE {
-    return NULL;
-  }
-
-  virtual bool UseTransparentWindows() const OVERRIDE {
-    return false;
-  }
-
-  virtual void AddRef() OVERRIDE {
-  }
-
-  virtual void ReleaseRef() OVERRIDE {
-  }
-
-  // Converts views::Event::flags to a WindowOpenDisposition.
-  virtual int GetDispositionForEvent(int event_flags) OVERRIDE {
-    return 0;
-  }
-
-#if defined(USE_AURA)
-  virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
-      views::NativeWidgetAura* native_widget) OVERRIDE {
-    return NULL;
-  }
-#endif
-
-  content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE {
-    return NULL;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
-};
-
 // Implement most of the ui::MenuModel pure virtual methods for subclasses
 //
 // Exceptions:
 //  virtual int GetItemCount() const = 0;
 //  virtual ItemType GetTypeAt(int index) const = 0;
 //  virtual int GetCommandIdAt(int index) const = 0;
 //  virtual string16 GetLabelAt(int index) const = 0;
 class CommonMenuModel : public ui::MenuModel {
  public:
   CommonMenuModel() {
@@ skipping 259 matching lines @@
   // Generate a mouse click on the specified view and post a new task.
   virtual void Click(views::View* view, const base::Closure& next) {
     ui_test_utils::MoveMouseToCenterAndPress(
         view,
         ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         next);
   }
 
   views::ViewsDelegate* old_views_delegate_;
-  TestViewsDelegate views_delegate_;
+  views::TestViewsDelegate views_delegate_;
 
   views::MenuButton* button_;
   TopMenuModel top_menu_model_;
   views::MenuModelAdapter menu_model_adapter_;
   views::MenuItemView* menu_;
   scoped_ptr<views::MenuRunner> menu_runner_;
 };
 
 #if defined(OS_WIN)
 #define MAYBE_RebuildMenu DISABLED_RebuildMenu
 #else
 #define MAYBE_RebuildMenu RebuildMenu
 #endif
 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu)