| Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc (revision 156649)
|
| +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc (working copy)
|
| @@ -37,7 +37,7 @@
|
| #include "ui/views/controls/menu/menu_controller.h"
|
| #include "ui/views/controls/menu/menu_item_view.h"
|
| #include "ui/views/controls/menu/submenu_view.h"
|
| -#include "ui/views/views_delegate.h"
|
| +#include "ui/views/test/test_views_delegate.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| using content::BrowserThread;
|
| @@ -55,68 +55,6 @@
|
| ui_controls::SendMouseEventsNotifyWhenDone(button, state, closure);
|
| }
|
|
|
| -class ViewsDelegateImpl : public views::ViewsDelegate {
|
| - public:
|
| - ViewsDelegateImpl() {}
|
| - virtual void SaveWindowPlacement(const views::Widget* window,
|
| - 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 0; }
|
| -#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 {
|
| - MessageLoopForUI::current()->Quit();
|
| - }
|
| -
|
| - 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
|
| -
|
| - virtual content::WebContents* CreateWebContents(
|
| - content::BrowserContext* browser_context,
|
| - content::SiteInstance* site_instance) OVERRIDE {
|
| - return NULL;
|
| - }
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl);
|
| -};
|
| -
|
| // PageNavigator implementation that records the URL.
|
| class TestingPageNavigator : public PageNavigator {
|
| public:
|
| @@ -289,7 +227,7 @@
|
| scoped_ptr<TestingProfile> profile_;
|
| scoped_ptr<Browser> browser_;
|
| content::TestBrowserThread file_thread_;
|
| - ViewsDelegateImpl views_delegate_;
|
| + views::TestViewsDelegate views_delegate_;
|
| };
|
|
|
| // Clicks on first menu, makes sure button is depressed. Moves mouse to first
|
|
|