diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 09:30:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 09:30:33 +0000 |
| commit | 536f8082c8e8b492086e7f675bdb477005f770cb (patch) | |
| tree | 5b22096c355bf4e8327bde51b7dcde0de2e5617b /chrome/browser/ui/views/menu_model_adapter_test.cc | |
| parent | 644a10733be94786e8169d035d7f527b105ee529 (diff) | |
| download | chromium_src-536f8082c8e8b492086e7f675bdb477005f770cb.zip chromium_src-536f8082c8e8b492086e7f675bdb477005f770cb.tar.gz chromium_src-536f8082c8e8b492086e7f675bdb477005f770cb.tar.bz2 | |
Original CL (http://codereview.chromium.org/9390038/) somehow got screwed and CQ couldn't patch it. This is exact copy of the original CL to land.
* Move automation/ui_controls to ui/ui_controls
* Refactored aura impl so that ui/ui_controls doesn't depend on
aura.
* Moved MoveMouseToCenterAndPress to ui_test_util.h as it depends on views and can't be declared in ui.
* a couple of cleanups:
- Renamed gtk_screen_utils.h to _util.h to match other util.h files.
- indent fix
- remove unnecessary includes.
This CL allows a test to use ui_controls without depending on chrome.
TBR=sky@chromium.org,erg@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9699098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127138 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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index 3d78504..d98966a 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -4,9 +4,10 @@ #include "base/callback.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/automation/ui_controls.h" #include "chrome/test/base/view_event_test_base.h" +#include "chrome/test/base/ui_test_utils.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" @@ -358,7 +359,7 @@ class MenuModelAdapterTest : public ViewEventTestBase, private: // Generate a mouse click on the specified view and post a new task. virtual void Click(views::View* view, const base::Closure& next) { - ui_controls::MoveMouseToCenterAndPress( + ui_test_utils::MoveMouseToCenterAndPress( view, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, |