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

Unified Diff: core/cross/object_manager.cc

Issue 151103: Changed way Packs cannot be created if there is no Renderer. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 6 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: core/cross/object_manager.cc
===================================================================
--- core/cross/object_manager.cc (revision 19521)
+++ core/cross/object_manager.cc (working copy)
@@ -43,8 +43,7 @@
ObjectManager::ObjectManager(ServiceLocator* service_locator)
: service_locator_(service_locator),
- service_(service_locator_, this),
- allow_pack_creation_(true) {
+ service_(service_locator_, this) {
}
ObjectManager::~ObjectManager() {
@@ -54,10 +53,6 @@
DLOG_ASSERT(object_map_.empty()) << "Client node leak.";
}
-void ObjectManager::DisallowPackCreation() {
- allow_pack_creation_ = false;
-}
-
std::vector<ObjectBase*> ObjectManager::GetObjects(
const String& name,
const String& class_type_name) const {
@@ -134,10 +129,6 @@
}
Pack* ObjectManager::CreatePack() {
- if (!allow_pack_creation_) {
- O3D_ERROR(service_locator_) << "Pack creation not allowed";
- return NULL;
- }
Pack::Ref pack(new Pack(service_locator_));
if (pack) {
pack_array_.push_back(pack);
« core/cross/client.cc ('K') | « core/cross/object_manager.h ('k') | core/cross/pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698