Commit bfe42aec authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

cef_binary_3.2454.1316.g29bd7d2.version

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64335 954022d7-b5bf-4e40-9824-e11837661b57
parent a3a59bba
...@@ -459,6 +459,7 @@ HEADERS += \ ...@@ -459,6 +459,7 @@ HEADERS += \
src/cef/windows/cefclient/browser/urlrequest_test.h \ src/cef/windows/cefclient/browser/urlrequest_test.h \
src/cef/windows/cefclient/browser/util_win.h \ src/cef/windows/cefclient/browser/util_win.h \
src/cef/windows/cefclient/browser/window_test.h \ src/cef/windows/cefclient/browser/window_test.h \
src/cef/windows/cefclient/browser/geometry_util.h \
src/cef/windows/cefclient/common/client_app.h \ src/cef/windows/cefclient/common/client_app.h \
src/cef/windows/cefclient/common/client_app_other.h \ src/cef/windows/cefclient/common/client_app_other.h \
src/cef/windows/cefclient/common/client_switches.h \ src/cef/windows/cefclient/common/client_switches.h \
...@@ -614,6 +615,7 @@ SOURCES += \ ...@@ -614,6 +615,7 @@ SOURCES += \
src/cef/windows/cefclient/browser/util_win.cc \ src/cef/windows/cefclient/browser/util_win.cc \
src/cef/windows/cefclient/browser/window_test.cc \ src/cef/windows/cefclient/browser/window_test.cc \
src/cef/windows/cefclient/browser/window_test_win.cc \ src/cef/windows/cefclient/browser/window_test_win.cc \
src/cef/windows/cefclient/browser/geometry_util.cc \
src/cef/windows/cefclient/common/client_app.cc \ src/cef/windows/cefclient/common/client_app.cc \
src/cef/windows/cefclient/common/client_app_delegates_common.cc \ src/cef/windows/cefclient/common/client_app_delegates_common.cc \
src/cef/windows/cefclient/common/client_app_other.cc \ src/cef/windows/cefclient/common/client_app_other.cc \
......
...@@ -260,7 +260,7 @@ class ClientHandler : public CefClient, ...@@ -260,7 +260,7 @@ class ClientHandler : public CefClient,
// Returns true if this handler uses off-screen rendering. // Returns true if this handler uses off-screen rendering.
bool is_osr() const { return is_osr_; } bool is_osr() const { return is_osr_; }
private: protected:
// Create a new popup window using the specified information. |is_devtools| // Create a new popup window using the specified information. |is_devtools|
// will be true if the window will be used for DevTools. Return true to // will be true if the window will be used for DevTools. Return true to
// proceed with popup browser creation or false to cancel the popup browser. // proceed with popup browser creation or false to cancel the popup browser.
......
...@@ -125,7 +125,7 @@ class ClientAppRenderer : public ClientApp, ...@@ -125,7 +125,7 @@ class ClientAppRenderer : public ClientApp,
CefProcessId source_process, CefProcessId source_process,
CefRefPtr<CefProcessMessage> message) OVERRIDE; CefRefPtr<CefProcessMessage> message) OVERRIDE;
private: protected:
// Set of supported Delegates. // Set of supported Delegates.
DelegateSet delegates_; DelegateSet delegates_;
......
...@@ -35,16 +35,16 @@ ...@@ -35,16 +35,16 @@
#ifndef CEF_INCLUDE_CEF_VERSION_H_ #ifndef CEF_INCLUDE_CEF_VERSION_H_
#define CEF_INCLUDE_CEF_VERSION_H_ #define CEF_INCLUDE_CEF_VERSION_H_
#define CEF_VERSION "3.2478.1316.gaa72f40" #define CEF_VERSION "3.2454.1316.g29bd7d2"
#define CEF_VERSION_MAJOR 3 #define CEF_VERSION_MAJOR 3
#define CEF_COMMIT_NUMBER 1316 #define CEF_COMMIT_NUMBER 1316
#define CEF_COMMIT_HASH "aa72f402ba86d0ef9a9ab53d74967a590c1622ea" #define CEF_COMMIT_HASH "29bd7d2c53d01653e0e823f7e85a414390f138d8"
#define COPYRIGHT_YEAR 2015 #define COPYRIGHT_YEAR 2015
#define CHROME_VERSION_MAJOR 46 #define CHROME_VERSION_MAJOR 45
#define CHROME_VERSION_MINOR 0 #define CHROME_VERSION_MINOR 0
#define CHROME_VERSION_BUILD 2478 #define CHROME_VERSION_BUILD 2454
#define CHROME_VERSION_PATCH 0 #define CHROME_VERSION_PATCH 26
#define DO_MAKE_STRING(p) #p #define DO_MAKE_STRING(p) #p
#define MAKE_STRING(p) DO_MAKE_STRING(p) #define MAKE_STRING(p) DO_MAKE_STRING(p)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment