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

Unified Diff: ui/views/mus/platform_window_mus.cc

Issue 1994763002: Wires up WorkspaceLayoutManager in mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: data deps Created 4 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 | « ui/views/mus/native_widget_mus.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/platform_window_mus.cc
diff --git a/ui/views/mus/platform_window_mus.cc b/ui/views/mus/platform_window_mus.cc
index 99fa1709e15c27778b7590380753f89b4aeb8c8a..e4163fb7ffc2691c3a967275ccc121d0086eb029 100644
--- a/ui/views/mus/platform_window_mus.cc
+++ b/ui/views/mus/platform_window_mus.cc
@@ -86,11 +86,14 @@ PlatformWindowMus::PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
delegate_->OnAcceleratedWidgetAvailable(
accelerated_widget, mus_window_->viewport_metrics().device_pixel_ratio);
- bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(mus_window_));
- bitmap_uploader_->Init(connector);
- prop_.reset(new ui::ViewProp(
- accelerated_widget, bitmap_uploader::kBitmapUploaderForAcceleratedWidget,
- bitmap_uploader_.get()));
+ if (connector) {
+ bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(mus_window_));
+ bitmap_uploader_->Init(connector);
+ prop_.reset(
+ new ui::ViewProp(accelerated_widget,
+ bitmap_uploader::kBitmapUploaderForAcceleratedWidget,
+ bitmap_uploader_.get()));
+ }
}
PlatformWindowMus::~PlatformWindowMus() {
« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698