Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: ui/ozone/platform/test/ozone_platform_test.cc

Issue 742103002: Ozone keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lite-code
Patch Set: reeeeebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/ozone/platform/test/BUILD.gn ('k') | ui/ozone/platform/test/test.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/ozone/platform/test/ozone_platform_test.h" 5 #include "ui/ozone/platform/test/ozone_platform_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" 9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
10 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
11 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
10 #include "ui/events/platform/platform_event_source.h" 12 #include "ui/events/platform/platform_event_source.h"
11 #include "ui/ozone/common/native_display_delegate_ozone.h" 13 #include "ui/ozone/common/native_display_delegate_ozone.h"
12 #include "ui/ozone/platform/test/test_window.h" 14 #include "ui/ozone/platform/test/test_window.h"
13 #include "ui/ozone/platform/test/test_window_manager.h" 15 #include "ui/ozone/platform/test/test_window_manager.h"
14 #include "ui/ozone/public/cursor_factory_ozone.h" 16 #include "ui/ozone/public/cursor_factory_ozone.h"
15 #include "ui/ozone/public/gpu_platform_support.h" 17 #include "ui/ozone/public/gpu_platform_support.h"
16 #include "ui/ozone/public/gpu_platform_support_host.h" 18 #include "ui/ozone/public/gpu_platform_support_host.h"
17 #include "ui/ozone/public/input_controller.h" 19 #include "ui/ozone/public/input_controller.h"
18 #include "ui/ozone/public/ozone_platform.h" 20 #include "ui/ozone/public/ozone_platform.h"
19 #include "ui/ozone/public/ozone_switches.h" 21 #include "ui/ozone/public/ozone_switches.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { 61 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
60 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); 62 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
61 } 63 }
62 64
63 void InitializeUI() override { 65 void InitializeUI() override {
64 window_manager_.reset(new TestWindowManager(file_path_)); 66 window_manager_.reset(new TestWindowManager(file_path_));
65 window_manager_->Initialize(); 67 window_manager_->Initialize();
66 // This unbreaks tests that create their own. 68 // This unbreaks tests that create their own.
67 if (!PlatformEventSource::GetInstance()) 69 if (!PlatformEventSource::GetInstance())
68 platform_event_source_ = PlatformEventSource::CreateDefault(); 70 platform_event_source_ = PlatformEventSource::CreateDefault();
71 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
72 make_scoped_ptr(new StubKeyboardLayoutEngine()));
69 73
70 input_controller_ = CreateStubInputController(); 74 input_controller_ = CreateStubInputController();
71 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); 75 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
72 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); 76 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
73 } 77 }
74 78
75 void InitializeGPU() override { 79 void InitializeGPU() override {
76 gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); 80 gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
77 } 81 }
78 82
(...skipping 13 matching lines...) Expand all
92 96
93 OzonePlatform* CreateOzonePlatformTest() { 97 OzonePlatform* CreateOzonePlatformTest() {
94 CommandLine* cmd = CommandLine::ForCurrentProcess(); 98 CommandLine* cmd = CommandLine::ForCurrentProcess();
95 base::FilePath location; 99 base::FilePath location;
96 if (cmd->HasSwitch(switches::kOzoneDumpFile)) 100 if (cmd->HasSwitch(switches::kOzoneDumpFile))
97 location = cmd->GetSwitchValuePath(switches::kOzoneDumpFile); 101 location = cmd->GetSwitchValuePath(switches::kOzoneDumpFile);
98 return new OzonePlatformTest(location); 102 return new OzonePlatformTest(location);
99 } 103 }
100 104
101 } // namespace ui 105 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/test/BUILD.gn ('k') | ui/ozone/platform/test/test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698