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

Unified Diff: ui/compositor/compositor.h

Issue 2651593002: mus: Remove the old client lib. (Closed)
Patch Set: restore test Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/BUILD.gn ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 7ecc5e588db8b8c2d1d7f82fb0b3f1c9618703b9..25bad57a8c55954d1cce700dec32395f9683a1ef 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -67,10 +67,6 @@ class Layer;
class Reflector;
class ScopedAnimationDurationScaleMode;
-#if defined(USE_AURA)
-class Window;
-#endif
-
const int kCompositorLockTimeoutMs = 67;
class COMPOSITOR_EXPORT ContextFactoryObserver {
@@ -305,12 +301,6 @@ class COMPOSITOR_EXPORT Compositor
gfx::AcceleratedWidget ReleaseAcceleratedWidget();
gfx::AcceleratedWidget widget() const;
-#if defined(USE_AURA)
- // Sets the window for the compositor to render into on mus+ash.
- void SetWindow(ui::Window* window);
- ui::Window* window() const;
-#endif
-
// Returns the vsync manager for this compositor.
scoped_refptr<CompositorVSyncManager> vsync_manager() const;
@@ -413,9 +403,6 @@ class COMPOSITOR_EXPORT Compositor
base::ObserverList<CompositorAnimationObserver> animation_observer_list_;
gfx::AcceleratedWidget widget_;
-#if defined(USE_AURA)
- ui::Window* window_;
-#endif
// A map from child id to parent id.
std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash> child_frame_sinks_;
bool widget_valid_;
« no previous file with comments | « services/ui/ws/BUILD.gn ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698