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

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

Issue 1460593004: Revert of p1 mus+ash chrome renders ui and content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/window_tree_host_mus.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_tree_host_mus.cc
diff --git a/ui/views/mus/window_tree_host_mus.cc b/ui/views/mus/window_tree_host_mus.cc
index 5f0b82564d30f07ff34c0d9618b636c7dd2321b2..7e01767aac928c4a2274e3fcc7a05f8b2668a204 100644
--- a/ui/views/mus/window_tree_host_mus.cc
+++ b/ui/views/mus/window_tree_host_mus.cc
@@ -4,11 +4,9 @@
#include "ui/views/mus/window_tree_host_mus.h"
-#include "components/bitmap_uploader/bitmap_uploader.h"
#include "mojo/application/public/interfaces/shell.mojom.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
-#include "ui/base/view_prop.h"
#include "ui/events/event.h"
#include "ui/views/mus/input_method_mus.h"
#include "ui/views/mus/native_widget_mus.h"
@@ -32,13 +30,6 @@
// TODO(sky): we need to transform for device scale though.
dispatcher()->set_transform_events(false);
compositor()->SetHostHasTransparentBackground(true);
-
- bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(window));
- bitmap_uploader_->Init(shell);
- prop_.reset(
- new ui::ViewProp(GetAcceleratedWidget(),
- bitmap_uploader::kBitmapUploaderForAcceleratedWidget,
- bitmap_uploader_.get()));
input_method_.reset(new InputMethodMUS(this, window));
SetSharedInputMethod(input_method_.get());
« no previous file with comments | « ui/views/mus/window_tree_host_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698