diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 19:04:44 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 19:04:44 +0000 |
| commit | ffeae4b4beb48be2734e7c0a2e04ab83dfc60091 (patch) | |
| tree | 2f884037673d5964b9f9a445879cdaccdcaff807 /chrome/browser/ui/views/menu_model_adapter_test.cc | |
| parent | 882ba1e272371308cfecfb5436eb5dec0ee0cea5 (diff) | |
| download | chromium_src-ffeae4b4beb48be2734e7c0a2e04ab83dfc60091.zip chromium_src-ffeae4b4beb48be2734e7c0a2e04ab83dfc60091.tar.gz chromium_src-ffeae4b4beb48be2734e7c0a2e04ab83dfc60091.tar.bz2 | |
views: Rename ViewMenuDelegate to MenuButtonDelegate and move to controls/button/.
The reason is that why was founding difficult to know what ViewMenuDelegate was referring to.
And because this delegate is always associated with a views::MenuButton.
BUG=117092
R=sky@chromium.org
TBR=stevenjb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9632001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/menu_model_adapter_test.cc')
| -rw-r--r-- | chrome/browser/ui/views/menu_model_adapter_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index ecf195b..2966bab 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -8,12 +8,12 @@ #include "chrome/test/base/view_event_test_base.h" #include "ui/base/models/menu_model.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.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/controls/menu/view_menu_delegate.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/root_view.h" @@ -242,7 +242,7 @@ class TopMenuModel : public CommonMenuModel { } // namespace class MenuModelAdapterTest : public ViewEventTestBase, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: MenuModelAdapterTest() : ViewEventTestBase(), @@ -283,7 +283,7 @@ class MenuModelAdapterTest : public ViewEventTestBase, return button_->GetPreferredSize(); } - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE { gfx::Point screen_location; views::View::ConvertPointToScreen(source, &screen_location); |