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

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

Issue 267293004: Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 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
Index: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
similarity index 54%
copy from mojo/services/public/cpp/view_manager/lib/view_manager.cc
copy to mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
index 4603abc3db11cddec574b742dc150dd1e67b7290..fdd4efd632ddb228a8c22cb788bfbb97809ded27 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc
@@ -2,21 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/public/cpp/view_manager/view_manager.h"
+#include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
+#include "ui/gl/gl_surface.h"
namespace mojo {
namespace services {
namespace view_manager {
-ViewManager::ViewManager(Shell* shell)
- : shell_(shell) {}
+ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
+ : TestSuite(argc, argv) {}
-ViewManager::~ViewManager() {}
+ViewManagerTestSuite::~ViewManagerTestSuite() {
+}
-void ViewManager::Init() {
- synchronizer_.reset(new ViewManagerSynchronizer(this));
+void ViewManagerTestSuite::Initialize() {
+ base::TestSuite::Initialize();
+ gfx::GLSurface::InitializeOneOffForTests();
}
} // namespace view_manager

Powered by Google App Engine
This is Rietveld 408576698