mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update all files to use Windows CRLF (\r\n) line endings (issue #45).
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@33 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
|
||||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
|
||||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "precompiled_libcef.h"
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "cpptoc/v8value_cpptoc.h"
|
||||
#include "ctocpp/handler_ctocpp.h"
|
||||
#include "ctocpp/v8handler_ctocpp.h"
|
||||
#include "base/string_util.h"
|
||||
#include "base/string_util.h"
|
||||
|
||||
|
||||
CEF_EXPORT int cef_initialize(int multi_threaded_message_loop,
|
||||
@@ -33,7 +33,7 @@ CEF_EXPORT void cef_shutdown()
|
||||
{
|
||||
CefShutdown();
|
||||
|
||||
#ifdef _DEBUG
|
||||
#ifdef _DEBUG
|
||||
// Check that all wrapper objects have been destroyed
|
||||
DCHECK(CefBrowserCppToC::DebugObjCt == 0);
|
||||
DCHECK(CefRequestCppToC::DebugObjCt == 0);
|
||||
@@ -44,7 +44,7 @@ CEF_EXPORT void cef_shutdown()
|
||||
DCHECK(CefV8ValueCppToC::DebugObjCt == 0);
|
||||
DCHECK(CefHandlerCToCpp::DebugObjCt == 0);
|
||||
DCHECK(CefV8HandlerCToCpp::DebugObjCt == 0);
|
||||
#endif // _DEBUG
|
||||
#endif // _DEBUG
|
||||
}
|
||||
|
||||
CEF_EXPORT void cef_do_message_loop_work()
|
||||
@@ -81,24 +81,24 @@ CEF_EXPORT int cef_register_plugin(const cef_plugin_info_t* plugin_info)
|
||||
pluginInfo.version = plugin_info->version;
|
||||
pluginInfo.description = plugin_info->description;
|
||||
|
||||
std::vector<std::wstring> mime_types, file_extensions;
|
||||
std::vector<std::wstring> descriptions;
|
||||
SplitString(plugin_info->mime_types, '|', &mime_types);
|
||||
SplitString(plugin_info->file_extensions, '|', &file_extensions);
|
||||
std::vector<std::wstring> mime_types, file_extensions;
|
||||
std::vector<std::wstring> descriptions;
|
||||
SplitString(plugin_info->mime_types, '|', &mime_types);
|
||||
SplitString(plugin_info->file_extensions, '|', &file_extensions);
|
||||
SplitString(plugin_info->type_descriptions, '|', &descriptions);
|
||||
|
||||
for (size_t i = 0; i < mime_types.size(); ++i) {
|
||||
CefPluginMimeType mimeType;
|
||||
|
||||
mimeType.mime_type = mime_types[i];
|
||||
|
||||
if (file_extensions.size() > i)
|
||||
SplitString(file_extensions[i], ',', &mimeType.file_extensions);
|
||||
|
||||
if (descriptions.size() > i)
|
||||
mimeType.description = descriptions[i];
|
||||
|
||||
pluginInfo.mime_types.push_back(mimeType);
|
||||
for (size_t i = 0; i < mime_types.size(); ++i) {
|
||||
CefPluginMimeType mimeType;
|
||||
|
||||
mimeType.mime_type = mime_types[i];
|
||||
|
||||
if (file_extensions.size() > i)
|
||||
SplitString(file_extensions[i], ',', &mimeType.file_extensions);
|
||||
|
||||
if (descriptions.size() > i)
|
||||
mimeType.description = descriptions[i];
|
||||
|
||||
pluginInfo.mime_types.push_back(mimeType);
|
||||
}
|
||||
|
||||
pluginInfo.np_getentrypoints = plugin_info->np_getentrypoints;
|
||||
|
Reference in New Issue
Block a user