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

Unified Diff: ui/views/mus/window_tree_host_mus.h

Issue 1438903002: p1 mus+ash chrome renders ui and content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleaned up Created 5 years, 1 month 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
Index: ui/views/mus/window_tree_host_mus.h
diff --git a/ui/views/mus/window_tree_host_mus.h b/ui/views/mus/window_tree_host_mus.h
index 758e97ba2d8898f0bf7e621a14c6116777d23582..8cafea7a2c00d63f7525b2f2d023b18cbea3a941 100644
--- a/ui/views/mus/window_tree_host_mus.h
+++ b/ui/views/mus/window_tree_host_mus.h
@@ -12,6 +12,10 @@
class SkBitmap;
+namespace bitmap_uploader {
+class BitmapUploader;
+}
+
namespace mojo {
class Shell;
}
@@ -22,6 +26,7 @@ class Window;
namespace ui {
class Compositor;
+class ViewProp;
}
namespace views {
@@ -52,6 +57,8 @@ class WindowTreeHostMus : public aura::WindowTreeHostPlatform {
scoped_ptr<InputMethodMUS> input_method_;
scoped_ptr<SurfaceContextFactory> context_factory_;
ui::PlatformWindowState show_state_;
+ scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
+ scoped_ptr<ui::ViewProp> prop_;
DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
};

Powered by Google App Engine
This is Rietveld 408576698