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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/shell/context.cc

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « mojo/services/native_viewport/main.cc ('k') | mojo/tools/roll/gpu_media.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 3c21980d12a74467b361334252b9e935d06d5385..215ed7b2259d98389f2b6f79f3b620f131f3d602 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -15,7 +15,7 @@
#include "base/memory/scoped_vector.h"
#include "base/strings/string_split.h"
#include "build/build_config.h"
-#include "gpu/command_buffer/service/mailbox_manager.h"
+#include "gpu/command_buffer/service/mailbox_manager_impl.h"
#include "mojo/application_manager/application_loader.h"
#include "mojo/application_manager/application_manager.h"
#include "mojo/application_manager/background_shell_application_loader.h"
@@ -114,7 +114,7 @@ class Context::NativeViewportApplicationLoader
public:
NativeViewportApplicationLoader()
: share_group_(new gfx::GLShareGroup),
- mailbox_manager_(new gpu::gles2::MailboxManager) {}
+ mailbox_manager_(new gpu::gles2::MailboxManagerImpl) {}
virtual ~NativeViewportApplicationLoader() {}
private:
« no previous file with comments | « mojo/services/native_viewport/main.cc ('k') | mojo/tools/roll/gpu_media.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698