mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Significant API changes for issue #218:
- Replace CefHandler with a new CefClient interface and separate handler interfaces. - Add support for virtual inheritance to allow multiple CefBase parented interfaces to be implemented in the same class. - Replace CefThreadSafeBase with IMPLEMENT_* macros to support virtual inheritance and to only provide locking implementations when needed. - Move the CefBrowserSettings parameter from CefInitialize to CreateBrowser. - Add a new cef_build.h header that provides platform-specific and OS_* defines. - Introduce the use of OVERRIDE to generate compiler errors on Windows if a child virtual method declaration doesn't match the parent declaration. - Use NDEBUG instead of _DEBUG because _DEBUG is not defined on Mac. (issue #240). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@235 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -21,7 +21,7 @@ class BrowserRequestContext;
|
||||
class CefBrowserImpl;
|
||||
class WebViewHost;
|
||||
|
||||
class CefContext : public CefThreadSafeBase<CefBase>
|
||||
class CefContext : public CefBase
|
||||
{
|
||||
public:
|
||||
typedef std::list<CefRefPtr<CefBrowserImpl> > BrowserList;
|
||||
@@ -30,8 +30,7 @@ public:
|
||||
~CefContext();
|
||||
|
||||
// These methods will be called on the main application thread.
|
||||
bool Initialize(const CefSettings& settings,
|
||||
const CefBrowserSettings& browser_defaults);
|
||||
bool Initialize(const CefSettings& settings);
|
||||
void Shutdown();
|
||||
|
||||
// Returns true if the context is initialized.
|
||||
@@ -52,8 +51,6 @@ public:
|
||||
const FilePath& cache_path() const { return cache_path_; }
|
||||
|
||||
const CefSettings& settings() const { return settings_; }
|
||||
const CefBrowserSettings& browser_defaults() const
|
||||
{ return browser_defaults_; }
|
||||
|
||||
// The BrowserRequestContext object is managed by CefProcessIOThread.
|
||||
void set_request_context(BrowserRequestContext* request_context)
|
||||
@@ -92,7 +89,6 @@ private:
|
||||
base::AtExitManager at_exit_manager_;
|
||||
|
||||
CefSettings settings_;
|
||||
CefBrowserSettings browser_defaults_;
|
||||
FilePath cache_path_;
|
||||
scoped_refptr<BrowserRequestContext> request_context_;
|
||||
scoped_ptr<DOMStorageContext> storage_context_;
|
||||
@@ -104,6 +100,9 @@ private:
|
||||
int next_browser_id_;
|
||||
|
||||
WebViewHost* current_webviewhost_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefContext);
|
||||
IMPLEMENT_LOCKING(CefContext);
|
||||
};
|
||||
|
||||
// Global context object pointer.
|
||||
|
Reference in New Issue
Block a user