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

Unified Diff: ui/views/examples/examples_main.cc

Issue 2688593002: WIP: Towards merging OffscreenCanvas and Mus code
Patch Set: Fix reflector unit test Created 3 years, 10 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/examples/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_main.cc
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 55e11c1177864aba787f7ac7439feb7dd9d300e7..5d5da0aabfced5053a7dd99cdcb697272084de32 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -16,7 +16,7 @@
#include "base/run_loop.h"
#include "base/test/test_discardable_memory_allocator.h"
#include "build/build_config.h"
-#include "cc/surfaces/surface_manager.h"
+#include "components/display_compositor/display_compositor.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
@@ -68,10 +68,10 @@ int main(int argc, char** argv) {
// The ContextFactory must exist before any Compositors are created.
bool context_factory_for_test = false;
- cc::SurfaceManager surface_manager;
+ display_compositor::DisplayCompositor display_compositor;
std::unique_ptr<ui::InProcessContextFactory> context_factory(
new ui::InProcessContextFactory(context_factory_for_test,
- &surface_manager));
+ &display_compositor));
context_factory->set_use_test_surface(false);
base::MessageLoopForUI message_loop;
« no previous file with comments | « ui/views/examples/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698