diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 01:48:54 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 01:48:54 +0000 |
| commit | 622262c7a52e1b1f2273c9138eb0db454f89f3e8 (patch) | |
| tree | ab03207d3355281bc2e0c40ea22b768c71324b28 /o3d | |
| parent | 66fad534eae2b62bbd8291387acb9e4cc97ea365 (diff) | |
| download | chromium_src-622262c7a52e1b1f2273c9138eb0db454f89f3e8.zip chromium_src-622262c7a52e1b1f2273c9138eb0db454f89f3e8.tar.gz chromium_src-622262c7a52e1b1f2273c9138eb0db454f89f3e8.tar.bz2 | |
Revert o3d changes in 70977
According to Bardley Nelson, o3d uses a pinned (stale) version of base,
and one must not update o3d to reflect new base changes.
BUG=None
TEST=None
TBR=bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/plugin/cross/main.cc | 3 | ||||
| -rw-r--r-- | o3d/plugin/cross/main_remote_cb.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/o3d/plugin/cross/main.cc b/o3d/plugin/cross/main.cc index 31afc5e..e17ba64 100644 --- a/o3d/plugin/cross/main.cc +++ b/o3d/plugin/cross/main.cc @@ -337,8 +337,7 @@ NPError EXPORT_SYMBOL OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs InitLogging(log.value().c_str(), logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, logging::DONT_LOCK_LOG_FILE, - logging::APPEND_TO_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); + logging::APPEND_TO_OLD_LOG_FILE); #endif // O3D_INTERNAL_PLUGIN DLOG(INFO) << "NP_Initialize"; diff --git a/o3d/plugin/cross/main_remote_cb.cc b/o3d/plugin/cross/main_remote_cb.cc index 0ea1234..e2346ed 100644 --- a/o3d/plugin/cross/main_remote_cb.cc +++ b/o3d/plugin/cross/main_remote_cb.cc @@ -74,8 +74,7 @@ NPError EXPORT_SYMBOL OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) { InitLogging(kLogFile, logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, logging::DONT_LOCK_LOG_FILE, - logging::APPEND_TO_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); + logging::APPEND_TO_OLD_LOG_FILE); NPError retval = InitializeNPNApi(browserFuncs); if (retval != NPERR_NO_ERROR) return retval; |