bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-23 07:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix line endings

Browse Source
This commit is contained in:
Marshall Greenblatt 2015-03-26 10:24:39 -07:00
parent 5e5bbac692
commit 1772ac0278
2 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
include/base/cef_basictypes.h
View File

@ -1,86 +1,86 @@
// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012 // Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
// Google Inc. All rights reserved. // Google Inc. All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
// //
// * Redistributions of source code must retain the above copyright // * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer. // notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above // * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer // copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the // in the documentation and/or other materials provided with the
// distribution. // distribution.
// * Neither the name of Google Inc. nor the name Chromium Embedded // * Neither the name of Google Inc. nor the name Chromium Embedded
// Framework nor the names of its contributors may be used to endorse // Framework nor the names of its contributors may be used to endorse
// or promote products derived from this software without specific prior // or promote products derived from this software without specific prior
// written permission. // written permission.
// //
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ #ifndef CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
#define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ #define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
#pragma once #pragma once
#if defined(BUILDING_CEF_SHARED) #if defined(BUILDING_CEF_SHARED)
// When building CEF include the Chromium header directly. // When building CEF include the Chromium header directly.
#include "base/basictypes.h" #include "base/basictypes.h"
#else // !BUILDING_CEF_SHARED #else // !BUILDING_CEF_SHARED
// The following is substantially similar to the Chromium implementation. // The following is substantially similar to the Chromium implementation.
// If the Chromium implementation diverges the below implementation should be // If the Chromium implementation diverges the below implementation should be
// updated to match. // updated to match.
#include <limits.h> // For UINT_MAX #include <limits.h> // For UINT_MAX
#include <stddef.h> // For size_t #include <stddef.h> // For size_t
#include "include/base/cef_build.h" #include "include/base/cef_build.h"
// The NSPR system headers define 64-bit as |long| when possible, except on // The NSPR system headers define 64-bit as |long| when possible, except on
// Mac OS X. In order to not have typedef mismatches, we do the same on LP64. // Mac OS X. In order to not have typedef mismatches, we do the same on LP64.
// //
// On Mac OS X, |long long| is used for 64-bit types for compatibility with // On Mac OS X, |long long| is used for 64-bit types for compatibility with
// <inttypes.h> format macros even in the LP64 model. // <inttypes.h> format macros even in the LP64 model.
#if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) #if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
typedef long int64; // NOLINT(runtime/int) typedef long int64; // NOLINT(runtime/int)
typedef unsigned long uint64; // NOLINT(runtime/int) typedef unsigned long uint64; // NOLINT(runtime/int)
#else #else
typedef long long int64; // NOLINT(runtime/int) typedef long long int64; // NOLINT(runtime/int)
typedef unsigned long long uint64; // NOLINT(runtime/int) typedef unsigned long long uint64; // NOLINT(runtime/int)
#endif #endif
// TODO: Remove these type guards. These are to avoid conflicts with // TODO: Remove these type guards. These are to avoid conflicts with
// obsolete/protypes.h in the Gecko SDK. // obsolete/protypes.h in the Gecko SDK.
#ifndef _INT32 #ifndef _INT32
#define _INT32 #define _INT32
typedef int int32; typedef int int32;
#endif #endif
// TODO: Remove these type guards. These are to avoid conflicts with // TODO: Remove these type guards. These are to avoid conflicts with
// obsolete/protypes.h in the Gecko SDK. // obsolete/protypes.h in the Gecko SDK.
#ifndef _UINT32 #ifndef _UINT32
#define _UINT32 #define _UINT32
typedef unsigned int uint32; typedef unsigned int uint32;
#endif #endif
// UTF-16 character type // UTF-16 character type
#ifndef char16 #ifndef char16
#if defined(WIN32) #if defined(WIN32)
typedef wchar_t char16; typedef wchar_t char16;
#else #else
typedef unsigned short char16; typedef unsigned short char16;
#endif #endif
#endif #endif
#endif // !BUILDING_CEF_SHARED #endif // !BUILDING_CEF_SHARED
#endif // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ #endif // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_

22
libcef/utility/content_utility_client.cc
View File

@ -21,13 +21,13 @@ bool Send(IPC::Message* message) {
return content::UtilityThread::Get()->Send(message); return content::UtilityThread::Get()->Send(message);
} }
void CreateProxyResolverFactory( void CreateProxyResolverFactory(
mojo::InterfaceRequest<net::interfaces::ProxyResolverFactory> request) { mojo::InterfaceRequest<net::interfaces::ProxyResolverFactory> request) {
// MojoProxyResolverFactoryImpl is strongly bound to the Mojo message pipe it // MojoProxyResolverFactoryImpl is strongly bound to the Mojo message pipe it
// is connected to. When that message pipe is closed, either explicitly on the // is connected to. When that message pipe is closed, either explicitly on the
// other end (in the browser process), or by a connection error, this object // other end (in the browser process), or by a connection error, this object
// will be destroyed. // will be destroyed.
new net::MojoProxyResolverFactoryImpl(request.Pass()); new net::MojoProxyResolverFactoryImpl(request.Pass());
} }
} // namespace } // namespace
@ -58,10 +58,10 @@ bool CefContentUtilityClient::OnMessageReceived(
return handled; return handled;
} }
void CefContentUtilityClient::RegisterMojoServices( void CefContentUtilityClient::RegisterMojoServices(
content::ServiceRegistry* registry) { content::ServiceRegistry* registry) {
registry->AddService<net::interfaces::ProxyResolverFactory>( registry->AddService<net::interfaces::ProxyResolverFactory>(
base::Bind(CreateProxyResolverFactory)); base::Bind(CreateProxyResolverFactory));
} }
void CefContentUtilityClient::OnStartupPing() { void CefContentUtilityClient::OnStartupPing() {