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

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: rebased, fixed release build 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
« no previous file with comments | « ui/views/mus/platform_window_mus.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5882a28d6262876b9e49d4df4b1a6cb453d18ee0..1a4473ee7a6c84a94335466e8b0af302ffd0b1ed 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 {
@@ -39,6 +44,9 @@ class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
~WindowTreeHostMus() override;
PlatformWindowMus* platform_window();
+ bitmap_uploader::BitmapUploader* bitmap_uploader() {
+ return bitmap_uploader_.get();
+ };
ui::PlatformWindowState show_state() const { return show_state_; }
private:
@@ -51,6 +59,8 @@ class VIEWS_MUS_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
NativeWidgetMus* native_widget_;
scoped_ptr<InputMethodMUS> input_method_;
ui::PlatformWindowState show_state_;
+ scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
+ scoped_ptr<ui::ViewProp> prop_;
DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
};
« no previous file with comments | « ui/views/mus/platform_window_mus.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698