diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 20:03:41 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 20:03:41 +0000 |
| commit | b82c42c45ee1b113377a2800b36d6e5e05b8b8e1 (patch) | |
| tree | 6034126ffc720a18cabc0bdb211de7ca10233670 /ui/views/test | |
| parent | ce8d264d556f06a4b46b58b95bc82a884bb315d0 (diff) | |
| download | chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.zip chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.tar.gz chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.tar.bz2 | |
* Separated implementation class from gfx::Screen
* Moved Monitor class to gfx/.
* Converted all use of gfx::Screen to match new API
BUG=115347,111990
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9960042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/test')
| -rw-r--r-- | ui/views/test/views_test_base.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index 996582f..00a7cb3 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -4,10 +4,6 @@ #include "ui/views/test/views_test_base.h" -#if defined(USE_ASH) -#include "ui/aura/test/test_screen.h" -#endif - #if defined(USE_AURA) #include "base/compiler_specific.h" #include "ui/aura/client/aura_constants.h" @@ -16,8 +12,10 @@ #include "ui/aura/root_window.h" #include "ui/aura/single_monitor_manager.h" #include "ui/aura/test/test_activation_client.h" +#include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_stacking_client.h" #include "ui/base/ime/input_method.h" +#include "ui/gfx/screen.h" namespace { @@ -85,9 +83,7 @@ void ViewsTestBase::SetUp() { #if defined(USE_AURA) aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); -#if defined(USE_ASH) gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); -#endif // USE_ASH root_window_->SetProperty( aura::client::kRootWindowInputMethodKey, test_input_method_.get()); |