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

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

Issue 1043233003: ozone: Add post message loop initialization hook (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: return without failing Created 5 years, 8 months 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/egltest/ozone_platform_egltest.cc ('k') | ui/ozone/public/ozone_platform.h » ('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" 10 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 input_controller_ = CreateStubInputController(); 85 input_controller_ = CreateStubInputController();
86 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); 86 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
87 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); 87 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
88 } 88 }
89 89
90 void InitializeGPU() override { 90 void InitializeGPU() override {
91 gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); 91 gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
92 } 92 }
93 93
94 void InitializeGpuPostMainLoop() override {}
95
94 private: 96 private:
95 scoped_ptr<TestWindowManager> window_manager_; 97 scoped_ptr<TestWindowManager> window_manager_;
96 scoped_ptr<PlatformEventSource> platform_event_source_; 98 scoped_ptr<PlatformEventSource> platform_event_source_;
97 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; 99 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
98 scoped_ptr<InputController> input_controller_; 100 scoped_ptr<InputController> input_controller_;
99 scoped_ptr<GpuPlatformSupport> gpu_platform_support_; 101 scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
100 scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; 102 scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
101 base::FilePath file_path_; 103 base::FilePath file_path_;
102 104
103 DISALLOW_COPY_AND_ASSIGN(OzonePlatformTest); 105 DISALLOW_COPY_AND_ASSIGN(OzonePlatformTest);
104 }; 106 };
105 107
106 } // namespace 108 } // namespace
107 109
108 OzonePlatform* CreateOzonePlatformTest() { 110 OzonePlatform* CreateOzonePlatformTest() {
109 base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); 111 base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
110 base::FilePath location; 112 base::FilePath location;
111 if (cmd->HasSwitch(switches::kOzoneDumpFile)) 113 if (cmd->HasSwitch(switches::kOzoneDumpFile))
112 location = cmd->GetSwitchValuePath(switches::kOzoneDumpFile); 114 location = cmd->GetSwitchValuePath(switches::kOzoneDumpFile);
113 return new OzonePlatformTest(location); 115 return new OzonePlatformTest(location);
114 } 116 }
115 117
116 } // namespace ui 118 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/egltest/ozone_platform_egltest.cc ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698