summaryrefslogtreecommitdiffstats
path: root/ui/aura/bench
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 04:36:56 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 04:36:56 +0000
commit2ad669a5d97593c90cc9dbdbecec53890c9246e6 (patch)
treef952abcf9a37f8ea5640fd8ff5c47a2d166ee445 /ui/aura/bench
parent3a90b45428982c2f69b8e9256adb548fb92478c5 (diff)
downloadchromium_src-2ad669a5d97593c90cc9dbdbecec53890c9246e6.zip
chromium_src-2ad669a5d97593c90cc9dbdbecec53890c9246e6.tar.gz
chromium_src-2ad669a5d97593c90cc9dbdbecec53890c9246e6.tar.bz2
move --aura-host-window-size to --ash-host-window-bounds
remove --use-fullscreen-window as this is no longer necessary. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/12261018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/bench')
-rw-r--r--ui/aura/bench/bench_main.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 7d0e134..a0c3d1c 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -13,7 +13,6 @@
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/aura/client/default_capture_client.h"
-#include "ui/aura/display_util.h"
#include "ui/aura/env.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/root_window.h"
@@ -299,11 +298,11 @@ int main(int argc, char** argv) {
MessageLoop message_loop(MessageLoop::TYPE_UI);
ui::CompositorTestSupport::Initialize();
aura::Env::GetInstance();
- aura::SetUseFullscreenHostWindow(true);
- aura::TestScreen test_screen;
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen);
+ scoped_ptr<aura::TestScreen> test_screen(
+ aura::TestScreen::CreateFullscreen());
+ gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());
scoped_ptr<aura::RootWindow> root_window(
- test_screen.CreateRootWindowForPrimaryDisplay());
+ test_screen->CreateRootWindowForPrimaryDisplay());
aura::client::SetCaptureClient(
root_window.get(),
new aura::client::DefaultCaptureClient(root_window.get()));