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

Side by Side Diff: services/ui/ws/platform_display_default.h

Issue 2763143002: Remove FrameGenerator::root_window_ (Closed)
Patch Set: Addressed comments Created 3 years, 9 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 | « services/ui/ws/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_default.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ 5 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ 6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #if !defined(OS_ANDROID) 75 #if !defined(OS_ANDROID)
76 std::unique_ptr<ui::ImageCursors> image_cursors_; 76 std::unique_ptr<ui::ImageCursors> image_cursors_;
77 #endif 77 #endif
78 78
79 PlatformDisplayDelegate* delegate_ = nullptr; 79 PlatformDisplayDelegate* delegate_ = nullptr;
80 std::unique_ptr<FrameGenerator> frame_generator_; 80 std::unique_ptr<FrameGenerator> frame_generator_;
81 81
82 display::ViewportMetrics metrics_; 82 display::ViewportMetrics metrics_;
83 std::unique_ptr<ui::PlatformWindow> platform_window_; 83 std::unique_ptr<ui::PlatformWindow> platform_window_;
84 gfx::AcceleratedWidget widget_; 84 gfx::AcceleratedWidget widget_;
85 float init_device_scale_factor_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); 86 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault);
88 }; 87 };
89 88
90 } // namespace ws 89 } // namespace ws
91 } // namespace ui 90 } // namespace ui
92 91
93 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ 92 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
OLDNEW
« no previous file with comments | « services/ui/ws/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_default.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698