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 /ui/aura/test/aura_test_base.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 'ui/aura/test/aura_test_base.cc')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index 1695700..dee54f6 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -9,6 +9,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_stacking_client.h" +#include "ui/aura/ui_controls_aura.h" +#include "ui/ui_controls/ui_controls.h" namespace aura { namespace test { @@ -25,6 +27,7 @@ void AuraTestBase::SetUp() { gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); Env::GetInstance()->SetMonitorManager( CreateSingleMonitorManager(root_window_.get())); + ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get())); helper_.InitRootWindow(root_window()); helper_.SetUp(); stacking_client_.reset(new TestStackingClient(root_window())); |