| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/base/view_event_test_platform_part.h" | 5 #include "chrome/test/base/view_event_test_platform_part.h" |
| 6 | 6 |
| 7 #include "base/macros.h" |
| 7 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 8 #include "ui/aura/env.h" | 9 #include "ui/aura/env.h" |
| 9 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
| 10 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 11 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 11 #include "ui/wm/core/wm_state.h" | 12 #include "ui/wm/core/wm_state.h" |
| 12 | 13 |
| 13 namespace { | 14 namespace { |
| 14 | 15 |
| 15 // ChromeViewsTestHelper implementation for non-ChromeOS environments, where the | 16 // ChromeViewsTestHelper implementation for non-ChromeOS environments, where the |
| 16 // Ash desktop environment is available (use_ash=1, chromeos=0). | 17 // Ash desktop environment is available (use_ash=1, chromeos=0). |
| (...skipping 29 matching lines...) Expand all Loading... |
| 46 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr); | 47 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr); |
| 47 } | 48 } |
| 48 | 49 |
| 49 } // namespace | 50 } // namespace |
| 50 | 51 |
| 51 // static | 52 // static |
| 52 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( | 53 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( |
| 53 ui::ContextFactory* context_factory) { | 54 ui::ContextFactory* context_factory) { |
| 54 return new ViewEventTestPlatformPartAsh(context_factory); | 55 return new ViewEventTestPlatformPartAsh(context_factory); |
| 55 } | 56 } |
| OLD | NEW |