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

Unified Diff: ash/display/mirror_window_controller.h

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 years, 7 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 | « ash/display/display_controller.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.h
diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h
index beb703ad577e29b6d69bf5f5aa5100350660fce8..baf5f0812aaffc19d81aa3abf4f65713b7d6ab00 100644
--- a/ash/display/mirror_window_controller.h
+++ b/ash/display/mirror_window_controller.h
@@ -18,6 +18,7 @@ class Window;
}
namespace ui {
+class ContextFactory;
class Reflector;
}
@@ -35,7 +36,7 @@ class MirrorWindowTestApi;
// is typically drawn by the window system.
class ASH_EXPORT MirrorWindowController : public aura::WindowTreeHostObserver {
public:
- MirrorWindowController();
+ explicit MirrorWindowController(ui::ContextFactory* context_factory);
virtual ~MirrorWindowController();
// Updates the root window's bounds using |display_info|.
@@ -63,6 +64,8 @@ class ASH_EXPORT MirrorWindowController : public aura::WindowTreeHostObserver {
// configuration.
scoped_ptr<RootWindowTransformer> CreateRootWindowTransformer() const;
+ ui::ContextFactory* context_factory_;
+
scoped_ptr<AshWindowTreeHost> ash_host_;
gfx::Size mirror_window_host_size_;
scoped_refptr<ui::Reflector> reflector_;
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698