mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Make CEF compliant with Google/Chromium style (issue #473).
- Add a new check_style tool based on Google's cpplint that can be used to verify compliance of pending changes and specific files/directories. - Update existing CEF source code to be compliant with the style requirements. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@463 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
|
||||
// Copyright (c) 2012 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.
|
||||
//
|
||||
@@ -10,12 +10,13 @@
|
||||
// for more information.
|
||||
//
|
||||
|
||||
#ifndef _FRAME_CTOCPP_H
|
||||
#define _FRAME_CTOCPP_H
|
||||
#ifndef CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_
|
||||
#define CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_
|
||||
#pragma once
|
||||
|
||||
#ifndef USING_CEF_SHARED
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "include/cef_frame.h"
|
||||
#include "include/capi/cef_frame_capi.h"
|
||||
@@ -34,10 +35,9 @@
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
class CefFrameCToCpp
|
||||
: public CefCToCpp<CefFrameCToCpp, CefFrame, cef_frame_t>
|
||||
{
|
||||
public:
|
||||
CefFrameCToCpp(cef_frame_t* str)
|
||||
: public CefCToCpp<CefFrameCToCpp, CefFrame, cef_frame_t> {
|
||||
public:
|
||||
explicit CefFrameCToCpp(cef_frame_t* str)
|
||||
: CefCToCpp<CefFrameCToCpp, CefFrame, cef_frame_t>(str) {}
|
||||
virtual ~CefFrameCToCpp() {}
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
virtual CefString GetText() OVERRIDE;
|
||||
virtual void LoadRequest(CefRefPtr<CefRequest> request) OVERRIDE;
|
||||
virtual void LoadURL(const CefString& url) OVERRIDE;
|
||||
virtual void LoadString(const CefString& string,
|
||||
virtual void LoadString(const CefString& string_val,
|
||||
const CefString& url) OVERRIDE;
|
||||
virtual void LoadStream(CefRefPtr<CefStreamReader> stream,
|
||||
const CefString& url) OVERRIDE;
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
virtual bool IsMain() OVERRIDE;
|
||||
virtual bool IsFocused() OVERRIDE;
|
||||
virtual CefString GetName() OVERRIDE;
|
||||
virtual long long GetIdentifier() OVERRIDE;
|
||||
virtual int64 GetIdentifier() OVERRIDE;
|
||||
virtual CefRefPtr<CefFrame> GetParent() OVERRIDE;
|
||||
virtual CefString GetURL() OVERRIDE;
|
||||
virtual CefRefPtr<CefBrowser> GetBrowser() OVERRIDE;
|
||||
@@ -72,6 +72,6 @@ public:
|
||||
virtual CefRefPtr<CefV8Context> GetV8Context() OVERRIDE;
|
||||
};
|
||||
|
||||
#endif // USING_CEF_SHARED
|
||||
#endif // _FRAME_CTOCPP_H
|
||||
#endif // USING_CEF_SHARED
|
||||
#endif // CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_
|
||||
|
||||
|
Reference in New Issue
Block a user