Fix crash when scrolling to the bottom of an iframe with --root-layer-scrolls

- Load CEF configuration using `find_package(CEF)`.
- Use per-target configuration via a new SET_EXECUTABLE_TARGET_PROPERTIES
  macro instead of setting global CMAKE_* variables.
- Support building projects more easily with an external binary
  distribution directory.
- Improve related documentation.

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': '12bfc3360892ec53cd00fc239a47e5298beb063b',
+  'chromium_checkout': 'refs/tags/52.0.2743.116',
 }

CMakeLists.txt.in

@@ -24,39 +24,38 @@
 #
 # This CEF binary distribution includes the following CMake files:
 #
-# CMakeLists.txt              Bootstrap that sets up the CMake environment and
-#                             loads the other CMake files.
-# macros.cmake                Helper macros for building a generic CEF-based
-#                             application.
+# CMakeLists.txt              Bootstrap that sets up the CMake environment.
+# cmake/*.cmake               CEF configuration files shared by all targets.
 # libcef_dll/CMakeLists.txt   Defines the libcef_dll_wrapper target.
 # cefclient/CMakeLists.txt    Defines the cefclient target.
 # cefsimple/CMakeLists.txt    Defines the cefsimple target.
 #
-# Existing CMake projects that use this binary distribution without changing the
-# directory structure can include the existing "libcef_dll/CMakeLists.txt" file
-# with minimal or no changes.
+# See the "TODO:" comments below for guidance on how to integrate this CEF
+# binary distribution into a new or existing CMake project.
 #
 # BUILD REQUIREMENTS
 #
 # The below requirements must be met to build this CEF binary distribution.
 #
-# - CMake version 2.8.12.2 or newer.
+# - CMake version 2.8.12.1 or newer.
 #
 # - Linux requirements:
 #   Currently supported distributions include Debian Wheezy, Ubuntu Precise, and
-#   related. Newer versions will likely also work but may not have been tested.
+#   related. Ubuntu 14.04 64-bit is recommended. Newer versions will likely also
+#   work but may not have been tested.
 #   Required packages include:
 #     build-essential
 #     libgtk2.0-dev     (required by the cefclient target only)
 #     libgtkglext1-dev  (required by the cefclient target only)
 #
 # - Mac OS X requirements:
-#   Xcode 5 or newer building on Mac OS X 10.7 (Lion) or newer. The Xcode
-#   command-line tools must also be installed.
+#   Xcode 5 or newer building on Mac OS X 10.9 (Mavericks) or newer. Xcode 7.2
+#   and OS X 10.11 are recommended. The Xcode command-line tools must also be
+#   installed. Only 64-bit builds are supported on OS X.
 #
 # - Windows requirements:
-#   Visual Studio 2010 or newer building on Windows XP SP3 or newer. 64-bit
-#   version of Windows 7 or newer recommended.
+#   Visual Studio 2010 or newer building on Windows 7 or newer. Visual Studio
+#   2015 Update 2 and Windows 10 64-bit are recommended.
 #
 # BUILD EXAMPLES
 #
@@ -77,15 +76,6 @@
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
-# To perform a Mac OS X build using a 32-bit CEF binary distribution:
-#   Using the Xcode IDE:
-#     > cmake -G "Xcode" -DPROJECT_ARCH="i386" ..
-#     Open build\cef.xcodeproj in Xcode and select Product > Build.
-#
-#   Using Ninja:
-#     > cmake -G "Ninja" -DPROJECT_ARCH="i386" -DCMAKE_BUILD_TYPE=Debug ..
-#     > ninja cefclient cefsimple
-#
 # To perform a Mac OS X build using a 64-bit CEF binary distribution:
 #   Using the Xcode IDE:
 #     > cmake -G "Xcode" -DPROJECT_ARCH="x86_64" ..
@@ -96,486 +86,122 @@
 #     > ninja cefclient cefsimple
 #
 # To perform a Windows build using a 32-bit CEF binary distribution:
-#   Using the Visual Studio 2013 IDE:
-#     > cmake -G "Visual Studio 12" ..
+#   Using the Visual Studio 2015 IDE:
+#     > cmake -G "Visual Studio 14" ..
 #     Open build\cef.sln in Visual Studio and select Build > Build Solution.
 #
-#   Using Ninja with Visual Studio 2013 command-line tools:
+#   Using Ninja with Visual Studio 2015 command-line tools:
 #     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"
+#     > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
 # To perform a Windows build using a 64-bit CEF binary distribution:
-#   Using the Visual Studio 2013 IDE:
-#     > cmake -G "Visual Studio 12 Win64" ..
+#   Using the Visual Studio 2015 IDE:
+#     > cmake -G "Visual Studio 14 Win64" ..
 #     Open build\cef.sln in Visual Studio and select Build > Build Solution.
 #
-#   Using Ninja with Visual Studio 2013 command-line tools:
+#   Using Ninja with Visual Studio 2015 command-line tools:
 #     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\vcvars64.bat"
+#     > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 
 #
-# Shared configuration.
+# Global setup.
 #
 
-cmake_minimum_required(VERSION 2.8.12.2)
+cmake_minimum_required(VERSION 2.8.12.1)
 
 # Only generate Debug and Release configuration types.
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
 # Project name.
+# TODO: Change this line to match your project name when you copy this file.
 project(cef)
 
 # Use folders in the resulting project files.
 set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 
-# Determine the platform.
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-  set(OS_MACOSX 1)
-  set(OS_POSIX 1)
-elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-  set(OS_LINUX 1)
-  set(OS_POSIX 1)
-elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-  set(OS_WINDOWS 1)
-endif()
 
-# Determine the project architecture.
-if(NOT DEFINED PROJECT_ARCH)
-  if(CMAKE_SIZEOF_VOID_P MATCHES 8)
-    set(PROJECT_ARCH "x86_64")
-  else()
-    set(PROJECT_ARCH "x86")
-  endif()
+#
+# CEF_ROOT setup.
+# This variable must be set to locate the binary distribution.
+# TODO: Choose one of the below examples and comment out the rest.
+#
 
-  if(OS_MACOSX)
-    # PROJECT_ARCH should be specified on Mac OS X.
-    message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
-  endif()
-endif()
+# Example 1: The current directory contains both the complete binary
+#            distribution and your project.
+# A. Comment in these lines:
+#
+set(CEF_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake")
 
-if(NOT CMAKE_BUILD_TYPE AND
-   (${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles"))
-  # CMAKE_BUILD_TYPE should be specified when using Ninja or Unix Makefiles.
-  set(CMAKE_BUILD_TYPE Release)
-  message(WARNING "No CMAKE_BUILD_TYPE value selected, using ${CMAKE_BUILD_TYPE}")
-endif()
+# Example 2: The binary distribution is in a separate directory from your
+#            project. Locate the binary distribution using the CEF_ROOT CMake
+#            variable.
+# A. Create a directory structure for your project like the following:
+#    myproject/
+#      CMakeLists.txt    <= top-level CMake configuration
+#      mytarget/
+#        CMakeLists.txt  <= CMake configuration for `mytarget`
+#        ... other `mytarget` source files
+# B. Copy this file to "myproject/CMakeLists.txt" as the top-level CMake
+#    configuration.
+# C. Create the target-specific "myproject/mytarget/CMakeLists.txt" file for
+#    your application. See the included cefclient and cefsimple CMakeLists.txt
+#    files as an example.
+# D. Comment in these lines:
+#
+# set(CEF_ROOT "c:/path/to/cef_binary_3.2704.xxxx.gyyyyyyy_windows32")
+# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake")
 
-# Include cmake macros.
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
-include("macros")
-
-# Source include directory.
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-# Allow C++ programs to use stdint.h macros specified in the C99 standard that
-# aren't in the C++ standard (e.g. UINT8_MAX, INT64_MIN, etc).
-add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS)
+# Example 3: The binary distribution is in a separate directory from your
+#            project. Locate the binary distribution using the CEF_ROOT
+#            environment variable.
+# A. Create a directory structure for your project like the following:
+#    myproject/
+#      CMakeLists.txt    <= top-level CMake configuration
+#      cmake/
+#        FindCEF.cmake   <= CEF CMake configuration entry point
+#      mytarget/
+#        CMakeLists.txt  <= CMake configuration for `mytarget`
+#        ... other `mytarget` source files
+# B. Copy this file to "myproject/CMakeLists.txt" as the top-level CMake
+#    configuration.
+# C. Copy the cmake/FindCEF.cmake file to "myproject/cmake/FindCEF.cmake".
+# D. Create the target-specific "myproject/mytarget/CMakeLists.txt" file for
+#    your application. See the included cefclient and cefsimple CMakeLists.txt
+#    files as an example.
+# E. Set the CEF_ROOT environment variable before executing CMake. For example:
+#    > set CEF_ROOT=c:\path\to\cef_binary_3.2704.xxxx.gyyyyyyy_windows32
+# F. Comment in these lines:
+#
+# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 
 #
-# Linux configuration.
+# Load the CEF configuration.
 #
 
-if(OS_LINUX)
-  # Platform-specific compiler/linker flags.
-  set(CEF_LIBTYPE                 SHARED)
-  # -fno-strict-aliasing            = Avoid assumptions regarding non-aliasing of objects of different types
-  # -fPIC                           = Generate position-independent code for shared libraries
-  # -fstack-protector               = Protect some vulnerable functions from stack-smashing (security feature)
-  # -funwind-tables                 = Support stack unwinding for backtrace()
-  # -fvisibility=hidden             = Give hidden visibility to declarations that are not explicitly marked as visible
-  # --param=ssp-buffer-size=4       = Set the minimum buffer size protected by SSP (security feature, related to stack-protector)
-  # -pipe                           = Use pipes rather than temporary files for communication between build stages
-  # -pthread                        = Use the pthread library
-  # -Wall                           = Enable all warnings
-  # -Werror                         = Treat warnings as errors
-  # -Wno-missing-field-initializers = Don't warn about missing field initializers
-  # -Wno-unused-parameter           = Don't warn about unused parameters
-  set(CEF_COMPILER_FLAGS          "-fno-strict-aliasing -fPIC -fstack-protector -funwind-tables -fvisibility=hidden --param=ssp-buffer-size=4 -pipe -pthread -Wall -Werror -Wno-missing-field-initializers -Wno-unused-parameter")
-  # -std=c99                        = Use the C99 language standard
-  set(CEF_C_COMPILER_FLAGS        "-std=c99")
-  # -fno-exceptions                 = Disable exceptions
-  # -fno-rtti                       = Disable real-time type information
-  # -fno-threadsafe-statics         = Don't generate thread-safe statics
-  # -fvisibility-inlines-hidden     = Give hidden visibility to inlined class member functions
-  # -std=gnu++11                    = Use the C++11 language standard including GNU extensions
-  # -Wsign-compare                  = Warn about mixed signed/unsigned type comparisons
-  set(CEF_CXX_COMPILER_FLAGS      "-fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -Wsign-compare")
-  # -O0                             = Disable optimizations
-  # -g                              = Generate debug information
-  set(CEF_COMPILER_FLAGS_DEBUG    "-O0 -g")
-  # -O2                             = Optimize for maximum speed
-  # -fdata-sections                 = Enable linker optimizations to improve locality of reference for data sections
-  # -ffunction-sections             = Enable linker optimizations to improve locality of reference for function sections
-  # -fno-ident                      = Ignore the #ident directive
-  # -DNDEBUG                        = Not a debug build
-  # -U_FORTIFY_SOURCE               = Undefine _FORTIFY_SOURCE in case it was previously defined
-  # -D_FORTIFY_SOURCE=2             = Add memory and string function protection (security feature, related to stack-protector)
-  set(CEF_COMPILER_FLAGS_RELEASE  "-O2 -fdata-sections -ffunction-sections -fno-ident -DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
-  # -Wl,--disable-new-dtags         = Don't generate new-style dynamic tags in ELF
-  # -Wl,--fatal-warnings            = Treat warnings as errors
-  # -Wl,-rpath,.                    = Set rpath so that libraries can be placed next to the executable
-  # -Wl,-z,noexecstack              = Mark the stack as non-executable (security feature)
-  # -Wl,-z,now                      = Resolve symbols on program start instead of on first use (security feature)
-  # -Wl,-z,relro                    = Mark relocation sections as read-only (security feature)
-  set(CEF_LINKER_FLAGS            "-fPIC -pthread -Wl,--disable-new-dtags -Wl,--fatal-warnings -Wl,-rpath,. -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro")
-  # -Wl,-O1                         = Enable linker optimizations
-  # -Wl,--as-needed                 = Only link libraries that export symbols used by the binary
-  # -Wl,--gc-sections               = Remove unused code resulting from -fdata-sections and -function-sections
-  set(CEF_LINKER_FLAGS_RELEASE    "-Wl,-O1 -Wl,--as-needed -Wl,--gc-sections")
-
-  include(CheckCCompilerFlag)
-  include(CheckCXXCompilerFlag)
-
-  # -Wno-unused-local-typedefs      = Don't warn about unused local typedefs
-  CHECK_C_COMPILER_FLAG(-Wno-unused-local-typedefs COMPILER_SUPPORTS_NO_UNUSED_LOCAL_TYPEDEFS)
-  if(COMPILER_SUPPORTS_NO_UNUSED_LOCAL_TYPEDEFS)
-    set(CEF_C_COMPILER_FLAGS      "${CEF_C_COMPILER_FLAGS} -Wno-unused-local-typedefs")
-  endif()
-
-  # -Wno-literal-suffix             = Don't warn about invalid suffixes on literals
-  CHECK_CXX_COMPILER_FLAG(-Wno-literal-suffix COMPILER_SUPPORTS_NO_LITERAL_SUFFIX)
-  if(COMPILER_SUPPORTS_NO_LITERAL_SUFFIX)
-    set(CEF_CXX_COMPILER_FLAGS    "${CEF_CXX_COMPILER_FLAGS} -Wno-literal-suffix")
-  endif()
-
-  # -Wno-narrowing                  = Don't warn about type narrowing
-  CHECK_CXX_COMPILER_FLAG(-Wno-narrowing COMPILER_SUPPORTS_NO_NARROWING)
-  if(COMPILER_SUPPORTS_NO_NARROWING)
-    set(CEF_CXX_COMPILER_FLAGS    "${CEF_CXX_COMPILER_FLAGS} -Wno-narrowing")
-  endif()
-
-  if(PROJECT_ARCH STREQUAL "x86_64")
-    # 64-bit architecture.
-    set(CEF_COMPILER_FLAGS        "${CEF_COMPILER_FLAGS} -m64 -march=x86-64")
-    set(CEF_LINKER_FLAGS          "${CEF_LINKER_FLAGS} -m64")
-  elseif(PROJECT_ARCH STREQUAL "x86")
-    # 32-bit architecture.
-    set(CEF_COMPILER_FLAGS        "${CEF_COMPILER_FLAGS} -msse2 -mfpmath=sse -mmmx -m32")
-    set(CEF_LINKER_FLAGS          "${CEF_LINKER_FLAGS} -m32")
-  endif()
-
-  # Allow the Large File Support (LFS) interface to replace the old interface.
-  add_definitions(-D_FILE_OFFSET_BITS=64)
-
-  # Standard libraries.
-  set(CEF_STANDARD_LIBS "X11")
-
-  # CEF directory paths.
-  set(CEF_RESOURCE_DIR        "${CMAKE_CURRENT_SOURCE_DIR}/Resources")
-  set(CEF_BINARY_DIR          "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}")
-  set(CEF_BINARY_DIR_DEBUG    "${CMAKE_CURRENT_SOURCE_DIR}/Debug")
-  set(CEF_BINARY_DIR_RELEASE  "${CMAKE_CURRENT_SOURCE_DIR}/Release")
-
-  # CEF library paths.
-  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/libcef.so")
-  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.so")
-
-  # List of CEF binary files.
-  set(CEF_BINARY_FILES
-    chrome-sandbox
-    libcef.so
-    natives_blob.bin
-    snapshot_blob.bin
-    )
-
-  # List of CEF resource files.
-  set(CEF_RESOURCE_FILES
-    cef.pak
-    cef_100_percent.pak
-    cef_200_percent.pak
-    cef_extensions.pak
-    devtools_resources.pak
-    icudtl.dat
-    locales
-    )
-endif()
+# Execute FindCEF.cmake which must exist in CMAKE_MODULE_PATH.
+find_package(CEF REQUIRED)
 
 
 #
-# Mac OS X configuration.
+# Define CEF-based targets.
 #
 
-if(OS_MACOSX)
-  # Platform-specific compiler/linker flags.
-  # See also SET_XCODE_TARGET_PROPERTIES in macros.cmake.
-  set(CEF_LIBTYPE                 SHARED)
-  # -fno-strict-aliasing            = Avoid assumptions regarding non-aliasing of objects of different types
-  # -fstack-protector               = Protect some vulnerable functions from stack-smashing (security feature)
-  # -funwind-tables                 = Support stack unwinding for backtrace()
-  # -fvisibility=hidden             = Give hidden visibility to declarations that are not explicitly marked as visible
-  # -Wall                           = Enable all warnings
-  # -Wendif-labels                  = Warn whenever an #else or an #endif is followed by text
-  # -Werror                         = Treat warnings as errors
-  # -Wextra                         = Enable additional warnings
-  # -Wnewline-eof                   = Warn about no newline at end of file
-  # -Wno-missing-field-initializers = Don't warn about missing field initializers
-  # -Wno-unused-parameter           = Don't warn about unused parameters
-  set(CEF_COMPILER_FLAGS          "-fno-strict-aliasing -fstack-protector -funwind-tables -fvisibility=hidden -Wall -Wendif-labels -Werror -Wextra -Wnewline-eof -Wno-missing-field-initializers -Wno-unused-parameter")
-  # -std=c99                        = Use the C99 language standard
-  set(CEF_C_COMPILER_FLAGS        "-std=c99")
-  # -fno-exceptions                 = Disable exceptions
-  # -fno-rtti                       = Disable real-time type information
-  # -fno-threadsafe-statics         = Don't generate thread-safe statics
-  # -fobjc-call-cxx-cdtors          = Call the constructor/destructor of C++ instance variables in ObjC objects
-  # -fvisibility-inlines-hidden     = Give hidden visibility to inlined class member functions
-  # -std=gnu++11                    = Use the C++11 language standard including GNU extensions
-  # -Wno-narrowing                  = Don't warn about type narrowing
-  # -Wsign-compare                  = Warn about mixed signed/unsigned type comparisons
-  set(CEF_CXX_COMPILER_FLAGS      "-fno-exceptions -fno-rtti -fno-threadsafe-statics -fobjc-call-cxx-cdtors -fvisibility-inlines-hidden -std=gnu++11 -Wno-narrowing -Wsign-compare")
-  # -O0                             = Disable optimizations
-  # -g                              = Generate debug information
-  set(CEF_COMPILER_FLAGS_DEBUG    "-O0 -g")
-  # -O3                             = Optimize for maximum speed plus a few extras
-  set(CEF_COMPILER_FLAGS_RELEASE  "-O3")
-  # -Wl,-search_paths_first         = Search for static or shared library versions in the same pass
-  # -Wl,-ObjC                       = Support creation of creation of ObjC static libraries 
-  # -Wl,-pie                        = Generate position-independent code suitable for executables only
-  set(CEF_LINKER_FLAGS            "-Wl,-search_paths_first -Wl,-ObjC -Wl,-pie")
-  # -Wl,-dead_strip                 = Strip dead code
-  set(CEF_LINKER_FLAGS_RELEASE    "-Wl,-dead_strip")
+# Include the libcef_dll_wrapper target.
+# Comes from the libcef_dll/CMakeLists.txt file in the binary distribution
+# directory.
+add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
 
-  # Standard libraries.
-  set(CEF_STANDARD_LIBS "-lpthread" "-framework Cocoa" "-framework AppKit")
-
-  # Find the newest available base SDK.
-  execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-  foreach(OS_VERSION 10.10 10.9 10.8 10.7)
-    set(SDK "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OS_VERSION}.sdk")
-    if(NOT "${CMAKE_OSX_SYSROOT}" AND EXISTS "${SDK}" AND IS_DIRECTORY "${SDK}")
-      set(CMAKE_OSX_SYSROOT ${SDK})
-    endif()
-  endforeach()
-
-  # Target SDK.
-  set(CEF_TARGET_SDK               "10.6")
-  set(CEF_COMPILER_FLAGS           "${CEF_COMPILER_FLAGS} -mmacosx-version-min=${CEF_TARGET_SDK}")
-  set(CMAKE_OSX_DEPLOYMENT_TARGET  ${CEF_TARGET_SDK})
-
-  # Target architecture.
-  if(PROJECT_ARCH STREQUAL "x86_64")
-    set(CMAKE_OSX_ARCHITECTURES "x86_64")
-  else()
-    set(CMAKE_OSX_ARCHITECTURES "i386")
-  endif()
-
-  # CEF directory paths.
-  set(CEF_BINARY_DIR          "${CMAKE_CURRENT_SOURCE_DIR}/$<CONFIGURATION>")
-  set(CEF_BINARY_DIR_DEBUG    "${CMAKE_CURRENT_SOURCE_DIR}/Debug")
-  set(CEF_BINARY_DIR_RELEASE  "${CMAKE_CURRENT_SOURCE_DIR}/Release")
-
-  # CEF library paths.
-  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/Chromium Embedded Framework.framework/Chromium Embedded Framework")
-  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/Chromium Embedded Framework.framework/Chromium Embedded Framework")
-endif()
-
-
-#
-# Windows configuration.
-#
-
-if(OS_WINDOWS)
-  # Platform-specific compiler/linker flags.
-  set(CEF_LIBTYPE                 STATIC)
-  # /MP                   = Multiprocess compilation
-  # /Gy                   = Enable function-level linking
-  # /GR-                  = Disable run-time type information
-  # /Zi                   = Enable program database
-  # /W4                   = Warning level 4
-  # /WX                   = Treat warnings as errors
-  # /wd"4100"             = Ignore "unreferenced formal parameter" warning
-  # /wd"4127"             = Ignore "conditional expression is constant" warning
-  # /wd"4244"             = Ignore "conversion possible loss of data" warning
-  # /wd"4512"             = Ignore "assignment operator could not be generated" warning
-  # /wd"4701"             = Ignore "potentially uninitialized local variable" warning
-  # /wd"4702"             = Ignore "unreachable code" warning
-  # /wd"4996"             = Ignore "function or variable may be unsafe" warning
-  set(CEF_COMPILER_FLAGS          "/MP /Gy /GR- /Zi /W4 /WX /wd\"4100\" /wd\"4127\" /wd\"4244\" /wd\"4512\" /wd\"4701\" /wd\"4702\" /wd\"4996\"")
-  # /MTd                  = Multithreaded debug runtime
-  # /Od                   = Disable optimizations
-  # /RTC1                 = Enable basic run-time checks
-  set(CEF_COMPILER_FLAGS_DEBUG    "/MTd /RTC1 /Od")
-  # /MT                   = Multithreaded release runtime
-  # /O2                   = Optimize for maximum speed
-  # /Ob2                  = Inline any suitable function
-  # /GF                   = Enable string pooling
-  # /D NDEBUG /D _NDEBUG  = Not a debug build
-  set(CEF_COMPILER_FLAGS_RELEASE  "/MT /O2 /Ob2 /GF /D NDEBUG /D _NDEBUG")
-  # /DEBUG                = Generate debug information
-  set(CEF_LINKER_FLAGS_DEBUG      "/DEBUG")
-  # /MANIFEST:NO          = No default manifest (see ADD_WINDOWS_MANIFEST macro usage)
-  set(CEF_EXE_LINKER_FLAGS        "/MANIFEST:NO")
-
-  # Standard definitions
-  # -DWIN32 -D_WIN32 -D_WINDOWS           = Windows platform
-  # -DUNICODE -D_UNICODE                  = Unicode build
-  # -DWINVER=0x0602 -D_WIN32_WINNT=0x602  = Targeting Windows 8
-  # -DNOMINMAX                            = Use the standard's templated min/max
-  # -DWIN32_LEAN_AND_MEAN                 = Exclude less common API declarations
-  # -D_HAS_EXCEPTIONS=0                   = Disable exceptions
-  add_definitions(-DWIN32 -D_WIN32 -D_WINDOWS -DUNICODE -D_UNICODE -DWINVER=0x0602
-                  -D_WIN32_WINNT=0x602 -DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0)
-
-  # Standard libraries.
-  set(CEF_STANDARD_LIBS "comctl32.lib" "rpcrt4.lib" "shlwapi.lib")
-
-  # CEF directory paths.
-  set(CEF_RESOURCE_DIR        "${CMAKE_CURRENT_SOURCE_DIR}/Resources")
-  set(CEF_BINARY_DIR          "${CMAKE_CURRENT_SOURCE_DIR}/$<CONFIGURATION>")
-  set(CEF_BINARY_DIR_DEBUG    "${CMAKE_CURRENT_SOURCE_DIR}/Debug")
-  set(CEF_BINARY_DIR_RELEASE  "${CMAKE_CURRENT_SOURCE_DIR}/Release")
-
-  # CEF library paths.
-  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/libcef.lib")
-  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.lib")
-
-  # List of CEF binary files.
-  set(CEF_BINARY_FILES
-    d3dcompiler_43.dll
-    d3dcompiler_47.dll
-    libcef.dll
-    libEGL.dll
-    libGLESv2.dll
-    natives_blob.bin
-    snapshot_blob.bin
-    )
-  if(PROJECT_ARCH STREQUAL "x86")
-    # Only used on 32-bit platforms.
-    set(CEF_BINARY_FILES
-      ${CEF_BINARY_FILES}
-      wow_helper.exe
-      )
-  endif()
-
-  # List of CEF resource files.
-  set(CEF_RESOURCE_FILES
-    cef.pak
-    cef_100_percent.pak
-    cef_200_percent.pak
-    cef_extensions.pak
-    devtools_resources.pak
-    icudtl.dat
-    locales
-    )
-
-  # Configure use of the sandbox.
-  option(USE_SANDBOX "Enable or disable use of the sandbox." ON)
-  if(USE_SANDBOX AND NOT MSVC_VERSION EQUAL 1800)
-    # The cef_sandbox.lib static library is currently built with VS2013. It will
-    # not link successfully with other VS versions.
-    set(USE_SANDBOX OFF)
-  endif()
-
-  if(USE_SANDBOX)
-    # Definition required by cef_sandbox.lib.
-    add_definitions(-DPSAPI_VERSION=1)
-    # Definition used by apps to test if the sandbox is enabled.
-    add_definitions(-DCEF_USE_SANDBOX)
-
-    # Libraries required by cef_sandbox.lib.
-    set(CEF_SANDBOX_STANDARD_LIBS "dbghelp.lib" "psapi.lib")
-
-    # CEF sandbox library paths.
-    set(CEF_SANDBOX_LIB_DEBUG "${CEF_BINARY_DIR_DEBUG}/cef_sandbox.lib")
-    set(CEF_SANDBOX_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/cef_sandbox.lib")
-  endif()
-
-  # Configure use of ATL.
-  option(USE_ATL "Enable or disable use of ATL." ON)
-  if(USE_ATL)
-    # Determine if the Visual Studio install supports ATL.
-    get_filename_component(VC_BIN_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
-    get_filename_component(VC_DIR ${VC_BIN_DIR} DIRECTORY)
-    if(NOT IS_DIRECTORY "${VC_DIR}/atlmfc")
-      set(USE_ATL OFF)
-    endif()
-  endif()
-
-  if(USE_ATL)
-    # Definition used by apps to test if ATL support is enabled.
-    add_definitions(-DCEF_USE_ATL)
-  endif()
-endif()
-
-
-#
-# Post-configuration actions.
-#
-
-# Merge compiler/linker flags.
-set(CMAKE_C_FLAGS                     "${CEF_COMPILER_FLAGS} ${CEF_C_COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS_DEBUG               "${CEF_COMPILER_FLAGS_DEBUG} ${CEF_C_COMPILER_FLAGS_DEBUG}")
-set(CMAKE_C_FLAGS_RELEASE             "${CEF_COMPILER_FLAGS_RELEASE} ${CEF_C_COMPILER_FLAGS_RELEASE}")
-set(CMAKE_CXX_FLAGS                   "${CEF_COMPILER_FLAGS} ${CEF_CXX_COMPILER_FLAGS}")
-set(CMAKE_CXX_FLAGS_DEBUG             "${CEF_COMPILER_FLAGS_DEBUG} ${CEF_CXX_COMPILER_FLAGS_DEBUG}")
-set(CMAKE_CXX_FLAGS_RELEASE           "${CEF_COMPILER_FLAGS_RELEASE} ${CEF_CXX_COMPILER_FLAGS_RELEASE}")
-set(CMAKE_EXE_LINKER_FLAGS            "${CEF_LINKER_FLAGS} ${CEF_EXE_LINKER_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG      "${CEF_LINKER_FLAGS_DEBUG} ${CEF_EXE_LINKER_FLAGS_DEBUG}")
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CEF_LINKER_FLAGS_RELEASE} ${CEF_EXE_LINKER_FLAGS_RELEASE}")
-set(CMAKE_SHARED_LINKER_FLAGS         "${CEF_LINKER_FLAGS} ${CEF_SHARED_LINKER_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS_DEBUG   "${CEF_LINKER_FLAGS_DEBUG} ${CEF_SHARED_LINKER_FLAGS_DEBUG}")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CEF_LINKER_FLAGS_RELEASE} ${CEF_SHARED_LINKER_FLAGS_RELEASE}")
-
-
-#
-# Include target subdirectories.
-#
-
-add_subdirectory(libcef_dll)
+# Include application targets.
+# Comes from the <target>/CMakeLists.txt file in the current directory.
+# TODO: Change these lines to match your project target when you copy this file.
 add_subdirectory(cefclient)
 add_subdirectory(cefsimple)
 
-
-#
 # Display configuration settings.
-#
-
-message(STATUS "*** CONFIGURATION SETTINGS ***")
-message(STATUS "Generator:                    ${CMAKE_GENERATOR}")
-message(STATUS "Platform:                     ${CMAKE_SYSTEM_NAME}")
-message(STATUS "Project architecture:         ${PROJECT_ARCH}")
-
-if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-  message(STATUS "Build type:                   ${CMAKE_BUILD_TYPE}")
-endif()
-
-if(OS_MACOSX)
-  message(STATUS "Base SDK:                     ${CMAKE_OSX_SYSROOT}")
-  message(STATUS "Target SDK:                   ${CEF_TARGET_SDK}")
-endif()
-
-if(OS_WINDOWS)
-  message(STATUS "CEF Windows sandbox:          ${USE_SANDBOX}")
-  message(STATUS "Visual Studio ATL support:    ${USE_ATL}")
-endif()
-
-set(LIBRARIES ${CEF_STANDARD_LIBS})
-if(OS_WINDOWS AND USE_SANDBOX)
-  set(LIBRARIES ${LIBRARIES} ${CEF_SANDBOX_STANDARD_LIBS})
-endif()
-message(STATUS "Standard libraries:           ${LIBRARIES}")
-
-get_directory_property(DEFINITIONS COMPILE_DEFINITIONS)
-message(STATUS "Compiler definitions:         ${DEFINITIONS}")
-
-message(STATUS "C_FLAGS:                      ${CMAKE_C_FLAGS}")
-message(STATUS "C_FLAGS_DEBUG:                ${CMAKE_C_FLAGS_DEBUG}")
-message(STATUS "C_FLAGS_RELEASE:              ${CMAKE_C_FLAGS_RELEASE}")
-message(STATUS "CXX_FLAGS:                    ${CMAKE_CXX_FLAGS}")
-message(STATUS "CXX_FLAGS_DEBUG:              ${CMAKE_CXX_FLAGS_DEBUG}")
-message(STATUS "CXX_FLAGS_RELEASE:            ${CMAKE_CXX_FLAGS_RELEASE}")
-message(STATUS "EXE_LINKER_FLAGS:             ${CMAKE_EXE_LINKER_FLAGS}")
-message(STATUS "EXE_LINKER_FLAGS_DEBUG:       ${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
-message(STATUS "EXE_LINKER_FLAGS_RELEASE:     ${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
-message(STATUS "SHARED_LINKER_FLAGS:          ${CMAKE_SHARED_LINKER_FLAGS}")
-message(STATUS "SHARED_LINKER_FLAGS_DEBUG:    ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
-message(STATUS "SHARED_LINKER_FLAGS_RELEASE:  ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
-
-if(OS_LINUX OR OS_WINDOWS)
-  message(STATUS "CEF Binary files:             ${CEF_BINARY_FILES}")
-  message(STATUS "CEF Resource files:           ${CEF_RESOURCE_FILES}")
-endif()
+PRINT_CEF_CONFIG()

README.md

@@ -5,6 +5,7 @@ The Chromium Embedded Framework (CEF) is a simple framework for embedding Chromi
 * Project Page - https://bitbucket.org/chromiumembedded/cef
 * Tutorial - https://bitbucket.org/chromiumembedded/cef/wiki/Tutorial
 * General Usage - https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage
+* Master Build Quick-Start - https://bitbucket.org/chromiumembedded/cef/wiki/MasterBuildQuickStart
 * Branches and Building - https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 * Support Forum - http://www.magpcss.org/ceforum/
 * CEF1 C++ API Docs - http://magpcss.org/ceforum/apidocs/

cef.gypi

@@ -9,6 +9,10 @@
     # Set ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1.
     'enable_basic_printing': 1,
     'enable_print_preview': 0,
+    # Enable support for Widevine CDM.
+    'enable_widevine': 1,
+    # Disable support for plugin installation.
+    'enable_plugin_installation': 0,
     'conditions': [
       # Directory for CEF source files.
       [ 'OS=="win"', {
@@ -20,12 +24,11 @@
         # Strip symbols and create dSYM files for the Release target.
         'mac_strip_release': 1,
       }],
+      ['os_posix==1 and OS!="mac" and OS!="android"', {
+        # Disable theme support on Linux so we don't need to implement
+        # ThemeService[Factory] classes.
+        'enable_themes': 0,
+      }]
     ]
-  }, 'conditions': [
-    ['os_posix==1 and OS!="mac" and OS!="android"', {
-      'target_defaults': {
-        'cflags_cc': ['-Wno-deprecated-declarations'],
-      },
-    }]
-  ],
+  }
 }

cef_paths.gypi

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
+# Copyright (c) 2016 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.
 #
@@ -33,11 +33,13 @@
       'include/cef_frame.h',
       'include/cef_geolocation.h',
       'include/cef_geolocation_handler.h',
+      'include/cef_image.h',
       'include/cef_jsdialog_handler.h',
       'include/cef_keyboard_handler.h',
       'include/cef_life_span_handler.h',
       'include/cef_load_handler.h',
       'include/cef_menu_model.h',
+      'include/cef_menu_model_delegate.h',
       'include/cef_navigation_entry.h',
       'include/cef_origin_whitelist.h',
       'include/cef_parser.h',
@@ -52,9 +54,11 @@
       'include/cef_request_context.h',
       'include/cef_request_context_handler.h',
       'include/cef_request_handler.h',
+      'include/cef_resource_bundle.h',
       'include/cef_resource_bundle_handler.h',
       'include/cef_resource_handler.h',
       'include/cef_response.h',
+      'include/cef_response_filter.h',
       'include/cef_scheme.h',
       'include/cef_ssl_info.h',
       'include/cef_stream.h',
@@ -68,6 +72,26 @@
       'include/cef_xml_reader.h',
       'include/cef_zip_reader.h',
       'include/test/cef_translator_test.h',
+      'include/views/cef_box_layout.h',
+      'include/views/cef_browser_view.h',
+      'include/views/cef_browser_view_delegate.h',
+      'include/views/cef_button.h',
+      'include/views/cef_button_delegate.h',
+      'include/views/cef_display.h',
+      'include/views/cef_fill_layout.h',
+      'include/views/cef_label_button.h',
+      'include/views/cef_layout.h',
+      'include/views/cef_menu_button.h',
+      'include/views/cef_menu_button_delegate.h',
+      'include/views/cef_panel.h',
+      'include/views/cef_panel_delegate.h',
+      'include/views/cef_scroll_view.h',
+      'include/views/cef_textfield.h',
+      'include/views/cef_textfield_delegate.h',
+      'include/views/cef_view.h',
+      'include/views/cef_view_delegate.h',
+      'include/views/cef_window.h',
+      'include/views/cef_window_delegate.h',
     ],
     'autogen_capi_includes': [
       'include/capi/cef_app_capi.h',
@@ -91,11 +115,13 @@
       'include/capi/cef_frame_capi.h',
       'include/capi/cef_geolocation_capi.h',
       'include/capi/cef_geolocation_handler_capi.h',
+      'include/capi/cef_image_capi.h',
       'include/capi/cef_jsdialog_handler_capi.h',
       'include/capi/cef_keyboard_handler_capi.h',
       'include/capi/cef_life_span_handler_capi.h',
       'include/capi/cef_load_handler_capi.h',
       'include/capi/cef_menu_model_capi.h',
+      'include/capi/cef_menu_model_delegate_capi.h',
       'include/capi/cef_navigation_entry_capi.h',
       'include/capi/cef_origin_whitelist_capi.h',
       'include/capi/cef_parser_capi.h',
@@ -110,9 +136,11 @@
       'include/capi/cef_request_context_capi.h',
       'include/capi/cef_request_context_handler_capi.h',
       'include/capi/cef_request_handler_capi.h',
+      'include/capi/cef_resource_bundle_capi.h',
       'include/capi/cef_resource_bundle_handler_capi.h',
       'include/capi/cef_resource_handler_capi.h',
       'include/capi/cef_response_capi.h',
+      'include/capi/cef_response_filter_capi.h',
       'include/capi/cef_scheme_capi.h',
       'include/capi/cef_ssl_info_capi.h',
       'include/capi/cef_stream_capi.h',
@@ -126,6 +154,26 @@
       'include/capi/cef_xml_reader_capi.h',
       'include/capi/cef_zip_reader_capi.h',
       'include/capi/test/cef_translator_test_capi.h',
+      'include/capi/views/cef_box_layout_capi.h',
+      'include/capi/views/cef_browser_view_capi.h',
+      'include/capi/views/cef_browser_view_delegate_capi.h',
+      'include/capi/views/cef_button_capi.h',
+      'include/capi/views/cef_button_delegate_capi.h',
+      'include/capi/views/cef_display_capi.h',
+      'include/capi/views/cef_fill_layout_capi.h',
+      'include/capi/views/cef_label_button_capi.h',
+      'include/capi/views/cef_layout_capi.h',
+      'include/capi/views/cef_menu_button_capi.h',
+      'include/capi/views/cef_menu_button_delegate_capi.h',
+      'include/capi/views/cef_panel_capi.h',
+      'include/capi/views/cef_panel_delegate_capi.h',
+      'include/capi/views/cef_scroll_view_capi.h',
+      'include/capi/views/cef_textfield_capi.h',
+      'include/capi/views/cef_textfield_delegate_capi.h',
+      'include/capi/views/cef_view_capi.h',
+      'include/capi/views/cef_view_delegate_capi.h',
+      'include/capi/views/cef_window_capi.h',
+      'include/capi/views/cef_window_delegate_capi.h',
     ],
     'autogen_library_side': [
       'libcef_dll/ctocpp/app_ctocpp.cc',
@@ -136,12 +184,22 @@
       'libcef_dll/cpptoc/before_download_callback_cpptoc.h',
       'libcef_dll/cpptoc/binary_value_cpptoc.cc',
       'libcef_dll/cpptoc/binary_value_cpptoc.h',
+      'libcef_dll/cpptoc/views/box_layout_cpptoc.cc',
+      'libcef_dll/cpptoc/views/box_layout_cpptoc.h',
       'libcef_dll/cpptoc/browser_cpptoc.cc',
       'libcef_dll/cpptoc/browser_cpptoc.h',
       'libcef_dll/cpptoc/browser_host_cpptoc.cc',
       'libcef_dll/cpptoc/browser_host_cpptoc.h',
       'libcef_dll/ctocpp/browser_process_handler_ctocpp.cc',
       'libcef_dll/ctocpp/browser_process_handler_ctocpp.h',
+      'libcef_dll/cpptoc/views/browser_view_cpptoc.cc',
+      'libcef_dll/cpptoc/views/browser_view_cpptoc.h',
+      'libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h',
+      'libcef_dll/cpptoc/views/button_cpptoc.cc',
+      'libcef_dll/cpptoc/views/button_cpptoc.h',
+      'libcef_dll/ctocpp/views/button_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/button_delegate_ctocpp.h',
       'libcef_dll/cpptoc/callback_cpptoc.cc',
       'libcef_dll/cpptoc/callback_cpptoc.h',
       'libcef_dll/ctocpp/client_ctocpp.cc',
@@ -170,10 +228,14 @@
       'libcef_dll/ctocpp/dialog_handler_ctocpp.h',
       'libcef_dll/cpptoc/dictionary_value_cpptoc.cc',
       'libcef_dll/cpptoc/dictionary_value_cpptoc.h',
+      'libcef_dll/cpptoc/views/display_cpptoc.cc',
+      'libcef_dll/cpptoc/views/display_cpptoc.h',
       'libcef_dll/ctocpp/display_handler_ctocpp.cc',
       'libcef_dll/ctocpp/display_handler_ctocpp.h',
       'libcef_dll/ctocpp/download_handler_ctocpp.cc',
       'libcef_dll/ctocpp/download_handler_ctocpp.h',
+      'libcef_dll/ctocpp/download_image_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/download_image_callback_ctocpp.h',
       'libcef_dll/cpptoc/download_item_cpptoc.cc',
       'libcef_dll/cpptoc/download_item_cpptoc.h',
       'libcef_dll/cpptoc/download_item_callback_cpptoc.cc',
@@ -186,6 +248,8 @@
       'libcef_dll/ctocpp/end_tracing_callback_ctocpp.h',
       'libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc',
       'libcef_dll/cpptoc/file_dialog_callback_cpptoc.h',
+      'libcef_dll/cpptoc/views/fill_layout_cpptoc.cc',
+      'libcef_dll/cpptoc/views/fill_layout_cpptoc.h',
       'libcef_dll/ctocpp/find_handler_ctocpp.cc',
       'libcef_dll/ctocpp/find_handler_ctocpp.h',
       'libcef_dll/ctocpp/focus_handler_ctocpp.cc',
@@ -198,24 +262,40 @@
       'libcef_dll/ctocpp/geolocation_handler_ctocpp.h',
       'libcef_dll/ctocpp/get_geolocation_callback_ctocpp.cc',
       'libcef_dll/ctocpp/get_geolocation_callback_ctocpp.h',
+      'libcef_dll/cpptoc/image_cpptoc.cc',
+      'libcef_dll/cpptoc/image_cpptoc.h',
       'libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc',
       'libcef_dll/cpptoc/jsdialog_callback_cpptoc.h',
       'libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc',
       'libcef_dll/ctocpp/jsdialog_handler_ctocpp.h',
       'libcef_dll/ctocpp/keyboard_handler_ctocpp.cc',
       'libcef_dll/ctocpp/keyboard_handler_ctocpp.h',
+      'libcef_dll/cpptoc/views/label_button_cpptoc.cc',
+      'libcef_dll/cpptoc/views/label_button_cpptoc.h',
+      'libcef_dll/cpptoc/views/layout_cpptoc.cc',
+      'libcef_dll/cpptoc/views/layout_cpptoc.h',
       'libcef_dll/ctocpp/life_span_handler_ctocpp.cc',
       'libcef_dll/ctocpp/life_span_handler_ctocpp.h',
       'libcef_dll/cpptoc/list_value_cpptoc.cc',
       'libcef_dll/cpptoc/list_value_cpptoc.h',
       'libcef_dll/ctocpp/load_handler_ctocpp.cc',
       'libcef_dll/ctocpp/load_handler_ctocpp.h',
+      'libcef_dll/cpptoc/views/menu_button_cpptoc.cc',
+      'libcef_dll/cpptoc/views/menu_button_cpptoc.h',
+      'libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h',
       'libcef_dll/cpptoc/menu_model_cpptoc.cc',
       'libcef_dll/cpptoc/menu_model_cpptoc.h',
+      'libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/menu_model_delegate_ctocpp.h',
       'libcef_dll/cpptoc/navigation_entry_cpptoc.cc',
       'libcef_dll/cpptoc/navigation_entry_cpptoc.h',
       'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc',
       'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h',
+      'libcef_dll/cpptoc/views/panel_cpptoc.cc',
+      'libcef_dll/cpptoc/views/panel_cpptoc.h',
+      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.h',
       'libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc',
       'libcef_dll/ctocpp/pdf_print_callback_ctocpp.h',
       'libcef_dll/cpptoc/post_data_cpptoc.cc',
@@ -248,12 +328,20 @@
       'libcef_dll/ctocpp/request_context_handler_ctocpp.h',
       'libcef_dll/ctocpp/request_handler_ctocpp.cc',
       'libcef_dll/ctocpp/request_handler_ctocpp.h',
+      'libcef_dll/ctocpp/resolve_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/resolve_callback_ctocpp.h',
+      'libcef_dll/cpptoc/resource_bundle_cpptoc.cc',
+      'libcef_dll/cpptoc/resource_bundle_cpptoc.h',
       'libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc',
       'libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h',
       'libcef_dll/ctocpp/resource_handler_ctocpp.cc',
       'libcef_dll/ctocpp/resource_handler_ctocpp.h',
       'libcef_dll/cpptoc/response_cpptoc.cc',
       'libcef_dll/cpptoc/response_cpptoc.h',
+      'libcef_dll/ctocpp/response_filter_ctocpp.cc',
+      'libcef_dll/ctocpp/response_filter_ctocpp.h',
+      'libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h',
       'libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc',
       'libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h',
       'libcef_dll/cpptoc/sslcert_principal_cpptoc.cc',
@@ -264,6 +352,8 @@
       'libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h',
       'libcef_dll/cpptoc/scheme_registrar_cpptoc.cc',
       'libcef_dll/cpptoc/scheme_registrar_cpptoc.h',
+      'libcef_dll/cpptoc/views/scroll_view_cpptoc.cc',
+      'libcef_dll/cpptoc/views/scroll_view_cpptoc.h',
       'libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc',
       'libcef_dll/ctocpp/set_cookie_callback_ctocpp.h',
       'libcef_dll/cpptoc/stream_reader_cpptoc.cc',
@@ -276,6 +366,10 @@
       'libcef_dll/ctocpp/task_ctocpp.h',
       'libcef_dll/cpptoc/task_runner_cpptoc.cc',
       'libcef_dll/cpptoc/task_runner_cpptoc.h',
+      'libcef_dll/cpptoc/views/textfield_cpptoc.cc',
+      'libcef_dll/cpptoc/views/textfield_cpptoc.h',
+      'libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h',
       'libcef_dll/cpptoc/test/translator_test_cpptoc.cc',
       'libcef_dll/cpptoc/test/translator_test_cpptoc.h',
       'libcef_dll/ctocpp/test/translator_test_handler_ctocpp.cc',
@@ -308,12 +402,20 @@
       'libcef_dll/cpptoc/v8value_cpptoc.h',
       'libcef_dll/cpptoc/value_cpptoc.cc',
       'libcef_dll/cpptoc/value_cpptoc.h',
+      'libcef_dll/cpptoc/views/view_cpptoc.cc',
+      'libcef_dll/cpptoc/views/view_cpptoc.h',
+      'libcef_dll/ctocpp/views/view_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/view_delegate_ctocpp.h',
       'libcef_dll/cpptoc/web_plugin_info_cpptoc.cc',
       'libcef_dll/cpptoc/web_plugin_info_cpptoc.h',
       'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc',
       'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h',
       'libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc',
       'libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h',
+      'libcef_dll/cpptoc/views/window_cpptoc.cc',
+      'libcef_dll/cpptoc/views/window_cpptoc.h',
+      'libcef_dll/ctocpp/views/window_delegate_ctocpp.cc',
+      'libcef_dll/ctocpp/views/window_delegate_ctocpp.h',
       'libcef_dll/ctocpp/write_handler_ctocpp.cc',
       'libcef_dll/ctocpp/write_handler_ctocpp.h',
       'libcef_dll/cpptoc/xml_reader_cpptoc.cc',
@@ -330,12 +432,22 @@
       'libcef_dll/ctocpp/before_download_callback_ctocpp.h',
       'libcef_dll/ctocpp/binary_value_ctocpp.cc',
       'libcef_dll/ctocpp/binary_value_ctocpp.h',
+      'libcef_dll/ctocpp/views/box_layout_ctocpp.cc',
+      'libcef_dll/ctocpp/views/box_layout_ctocpp.h',
       'libcef_dll/ctocpp/browser_ctocpp.cc',
       'libcef_dll/ctocpp/browser_ctocpp.h',
       'libcef_dll/ctocpp/browser_host_ctocpp.cc',
       'libcef_dll/ctocpp/browser_host_ctocpp.h',
       'libcef_dll/cpptoc/browser_process_handler_cpptoc.cc',
       'libcef_dll/cpptoc/browser_process_handler_cpptoc.h',
+      'libcef_dll/ctocpp/views/browser_view_ctocpp.cc',
+      'libcef_dll/ctocpp/views/browser_view_ctocpp.h',
+      'libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h',
+      'libcef_dll/ctocpp/views/button_ctocpp.cc',
+      'libcef_dll/ctocpp/views/button_ctocpp.h',
+      'libcef_dll/cpptoc/views/button_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/button_delegate_cpptoc.h',
       'libcef_dll/ctocpp/callback_ctocpp.cc',
       'libcef_dll/ctocpp/callback_ctocpp.h',
       'libcef_dll/cpptoc/client_cpptoc.cc',
@@ -364,10 +476,14 @@
       'libcef_dll/cpptoc/dialog_handler_cpptoc.h',
       'libcef_dll/ctocpp/dictionary_value_ctocpp.cc',
       'libcef_dll/ctocpp/dictionary_value_ctocpp.h',
+      'libcef_dll/ctocpp/views/display_ctocpp.cc',
+      'libcef_dll/ctocpp/views/display_ctocpp.h',
       'libcef_dll/cpptoc/display_handler_cpptoc.cc',
       'libcef_dll/cpptoc/display_handler_cpptoc.h',
       'libcef_dll/cpptoc/download_handler_cpptoc.cc',
       'libcef_dll/cpptoc/download_handler_cpptoc.h',
+      'libcef_dll/cpptoc/download_image_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/download_image_callback_cpptoc.h',
       'libcef_dll/ctocpp/download_item_ctocpp.cc',
       'libcef_dll/ctocpp/download_item_ctocpp.h',
       'libcef_dll/ctocpp/download_item_callback_ctocpp.cc',
@@ -380,6 +496,8 @@
       'libcef_dll/cpptoc/end_tracing_callback_cpptoc.h',
       'libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc',
       'libcef_dll/ctocpp/file_dialog_callback_ctocpp.h',
+      'libcef_dll/ctocpp/views/fill_layout_ctocpp.cc',
+      'libcef_dll/ctocpp/views/fill_layout_ctocpp.h',
       'libcef_dll/cpptoc/find_handler_cpptoc.cc',
       'libcef_dll/cpptoc/find_handler_cpptoc.h',
       'libcef_dll/cpptoc/focus_handler_cpptoc.cc',
@@ -392,24 +510,40 @@
       'libcef_dll/cpptoc/geolocation_handler_cpptoc.h',
       'libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc',
       'libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h',
+      'libcef_dll/ctocpp/image_ctocpp.cc',
+      'libcef_dll/ctocpp/image_ctocpp.h',
       'libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc',
       'libcef_dll/ctocpp/jsdialog_callback_ctocpp.h',
       'libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc',
       'libcef_dll/cpptoc/jsdialog_handler_cpptoc.h',
       'libcef_dll/cpptoc/keyboard_handler_cpptoc.cc',
       'libcef_dll/cpptoc/keyboard_handler_cpptoc.h',
+      'libcef_dll/ctocpp/views/label_button_ctocpp.cc',
+      'libcef_dll/ctocpp/views/label_button_ctocpp.h',
+      'libcef_dll/ctocpp/views/layout_ctocpp.cc',
+      'libcef_dll/ctocpp/views/layout_ctocpp.h',
       'libcef_dll/cpptoc/life_span_handler_cpptoc.cc',
       'libcef_dll/cpptoc/life_span_handler_cpptoc.h',
       'libcef_dll/ctocpp/list_value_ctocpp.cc',
       'libcef_dll/ctocpp/list_value_ctocpp.h',
       'libcef_dll/cpptoc/load_handler_cpptoc.cc',
       'libcef_dll/cpptoc/load_handler_cpptoc.h',
+      'libcef_dll/ctocpp/views/menu_button_ctocpp.cc',
+      'libcef_dll/ctocpp/views/menu_button_ctocpp.h',
+      'libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h',
       'libcef_dll/ctocpp/menu_model_ctocpp.cc',
       'libcef_dll/ctocpp/menu_model_ctocpp.h',
+      'libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/menu_model_delegate_cpptoc.h',
       'libcef_dll/ctocpp/navigation_entry_ctocpp.cc',
       'libcef_dll/ctocpp/navigation_entry_ctocpp.h',
       'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc',
       'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h',
+      'libcef_dll/ctocpp/views/panel_ctocpp.cc',
+      'libcef_dll/ctocpp/views/panel_ctocpp.h',
+      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.h',
       'libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc',
       'libcef_dll/cpptoc/pdf_print_callback_cpptoc.h',
       'libcef_dll/ctocpp/post_data_ctocpp.cc',
@@ -442,12 +576,20 @@
       'libcef_dll/cpptoc/request_context_handler_cpptoc.h',
       'libcef_dll/cpptoc/request_handler_cpptoc.cc',
       'libcef_dll/cpptoc/request_handler_cpptoc.h',
+      'libcef_dll/cpptoc/resolve_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/resolve_callback_cpptoc.h',
+      'libcef_dll/ctocpp/resource_bundle_ctocpp.cc',
+      'libcef_dll/ctocpp/resource_bundle_ctocpp.h',
       'libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc',
       'libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h',
       'libcef_dll/cpptoc/resource_handler_cpptoc.cc',
       'libcef_dll/cpptoc/resource_handler_cpptoc.h',
       'libcef_dll/ctocpp/response_ctocpp.cc',
       'libcef_dll/ctocpp/response_ctocpp.h',
+      'libcef_dll/cpptoc/response_filter_cpptoc.cc',
+      'libcef_dll/cpptoc/response_filter_cpptoc.h',
+      'libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h',
       'libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc',
       'libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h',
       'libcef_dll/ctocpp/sslcert_principal_ctocpp.cc',
@@ -458,6 +600,8 @@
       'libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h',
       'libcef_dll/ctocpp/scheme_registrar_ctocpp.cc',
       'libcef_dll/ctocpp/scheme_registrar_ctocpp.h',
+      'libcef_dll/ctocpp/views/scroll_view_ctocpp.cc',
+      'libcef_dll/ctocpp/views/scroll_view_ctocpp.h',
       'libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc',
       'libcef_dll/cpptoc/set_cookie_callback_cpptoc.h',
       'libcef_dll/ctocpp/stream_reader_ctocpp.cc',
@@ -470,6 +614,10 @@
       'libcef_dll/cpptoc/task_cpptoc.h',
       'libcef_dll/ctocpp/task_runner_ctocpp.cc',
       'libcef_dll/ctocpp/task_runner_ctocpp.h',
+      'libcef_dll/ctocpp/views/textfield_ctocpp.cc',
+      'libcef_dll/ctocpp/views/textfield_ctocpp.h',
+      'libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h',
       'libcef_dll/ctocpp/test/translator_test_ctocpp.cc',
       'libcef_dll/ctocpp/test/translator_test_ctocpp.h',
       'libcef_dll/cpptoc/test/translator_test_handler_cpptoc.cc',
@@ -502,12 +650,20 @@
       'libcef_dll/ctocpp/v8value_ctocpp.h',
       'libcef_dll/ctocpp/value_ctocpp.cc',
       'libcef_dll/ctocpp/value_ctocpp.h',
+      'libcef_dll/ctocpp/views/view_ctocpp.cc',
+      'libcef_dll/ctocpp/views/view_ctocpp.h',
+      'libcef_dll/cpptoc/views/view_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/view_delegate_cpptoc.h',
       'libcef_dll/ctocpp/web_plugin_info_ctocpp.cc',
       'libcef_dll/ctocpp/web_plugin_info_ctocpp.h',
       'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc',
       'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h',
       'libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc',
       'libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h',
+      'libcef_dll/ctocpp/views/window_ctocpp.cc',
+      'libcef_dll/ctocpp/views/window_ctocpp.h',
+      'libcef_dll/cpptoc/views/window_delegate_cpptoc.cc',
+      'libcef_dll/cpptoc/views/window_delegate_cpptoc.h',
       'libcef_dll/cpptoc/write_handler_cpptoc.cc',
       'libcef_dll/cpptoc/write_handler_cpptoc.h',
       'libcef_dll/ctocpp/xml_reader_ctocpp.cc',

cef_paths2.gypi

@@ -42,7 +42,6 @@
       'include/cef_base.h',
       'include/cef_pack_resources.h',
       'include/cef_pack_strings.h',
-      'include/cef_runnable.h',
       'include/cef_version.h',
       'include/internal/cef_export.h',
       'include/internal/cef_logging_internal.h',
@@ -107,7 +106,7 @@
       'libcef_dll/wrapper_types.h',
       '<@(autogen_library_side)',
     ],
-    'libcef_dll_wrapper_sources_common': [
+    'libcef_dll_wrapper_sources_base': [
       'libcef_dll/base/cef_atomicops_x86_gcc.cc',
       'libcef_dll/base/cef_bind_helpers.cc',
       'libcef_dll/base/cef_callback_helpers.cc',
@@ -120,6 +119,8 @@
       'libcef_dll/base/cef_thread_checker_impl.cc',
       'libcef_dll/base/cef_thread_collision_warner.cc',
       'libcef_dll/base/cef_weak_ptr.cc',
+    ],
+    'libcef_dll_wrapper_sources_common': [
       'libcef_dll/cpptoc/base_cpptoc.cc',
       'libcef_dll/cpptoc/base_cpptoc.h',
       'libcef_dll/cpptoc/cpptoc.h',
@@ -158,21 +159,31 @@
       'tests/cefclient/browser/client_types.h',
       'tests/cefclient/browser/dialog_test.cc',
       'tests/cefclient/browser/dialog_test.h',
+      'tests/cefclient/browser/geometry_util.cc',
+      'tests/cefclient/browser/geometry_util.h',
       'tests/cefclient/browser/main_context.cc',
       'tests/cefclient/browser/main_context.h',
       'tests/cefclient/browser/main_context_impl.cc',
       'tests/cefclient/browser/main_context_impl.h',
       'tests/cefclient/browser/main_message_loop.h',
       'tests/cefclient/browser/main_message_loop.cc',
+      'tests/cefclient/browser/main_message_loop_external_pump.cc',
+      'tests/cefclient/browser/main_message_loop_external_pump.h',
       'tests/cefclient/browser/main_message_loop_std.h',
       'tests/cefclient/browser/main_message_loop_std.cc',
       'tests/cefclient/browser/osr_dragdrop_events.h',
       'tests/cefclient/browser/osr_renderer.h',
       'tests/cefclient/browser/osr_renderer.cc',
+      'tests/cefclient/browser/preferences_test.cc',
+      'tests/cefclient/browser/preferences_test.h',
       'tests/cefclient/browser/resource.h',
+      'tests/cefclient/browser/resource_util.cc',
       'tests/cefclient/browser/resource_util.h',
+      'tests/cefclient/browser/response_filter_test.cc',
+      'tests/cefclient/browser/response_filter_test.h',
       'tests/cefclient/browser/root_window.cc',
       'tests/cefclient/browser/root_window.h',
+      'tests/cefclient/browser/root_window_create.cc',
       'tests/cefclient/browser/root_window_manager.cc',
       'tests/cefclient/browser/root_window_manager.h',
       'tests/cefclient/browser/scheme_test.cc',
@@ -184,6 +195,8 @@
       'tests/cefclient/browser/urlrequest_test.h',
       'tests/cefclient/browser/window_test.cc',
       'tests/cefclient/browser/window_test.h',
+      'tests/cefclient/browser/window_test_runner.cc',
+      'tests/cefclient/browser/window_test_runner.h',
     ],
     'cefclient_sources_common': [
       'tests/cefclient/common/client_app.cc',
@@ -210,17 +223,24 @@
     'cefclient_sources_resources': [
       'tests/cefclient/resources/binding.html',
       'tests/cefclient/resources/dialogs.html',
+      'tests/cefclient/resources/draggable.html',
       'tests/cefclient/resources/localstorage.html',
       'tests/cefclient/resources/logo.png',
+      'tests/cefclient/resources/menu_icon.1x.png',
+      'tests/cefclient/resources/menu_icon.2x.png',
       'tests/cefclient/resources/osr_test.html',
       'tests/cefclient/resources/other_tests.html',
       'tests/cefclient/resources/pdf.html',
       'tests/cefclient/resources/pdf.pdf',
       'tests/cefclient/resources/performance.html',
       'tests/cefclient/resources/performance2.html',
+      'tests/cefclient/resources/preferences.html',
+      'tests/cefclient/resources/response_filter.html',
       'tests/cefclient/resources/transparency.html',
       'tests/cefclient/resources/urlrequest.html',
       'tests/cefclient/resources/window.html',
+      'tests/cefclient/resources/window_icon.1x.png',
+      'tests/cefclient/resources/window_icon.2x.png',
       'tests/cefclient/resources/xmlhttprequest.html',
     ],
     'cefclient_sources_win': [
@@ -229,6 +249,7 @@
       'tests/cefclient/browser/browser_window_std_win.cc',
       'tests/cefclient/browser/browser_window_std_win.h',
       'tests/cefclient/browser/main_context_impl_win.cc',
+      'tests/cefclient/browser/main_message_loop_external_pump_win.cc',
       'tests/cefclient/browser/main_message_loop_multithreaded_win.cc',
       'tests/cefclient/browser/main_message_loop_multithreaded_win.h',
       'tests/cefclient/browser/osr_dragdrop_win.cc',
@@ -236,13 +257,20 @@
       'tests/cefclient/browser/osr_window_win.cc',
       'tests/cefclient/browser/osr_window_win.h',
       'tests/cefclient/browser/resource_util_win.cc',
+      'tests/cefclient/browser/root_window_views.cc',
+      'tests/cefclient/browser/root_window_views.h',
       'tests/cefclient/browser/root_window_win.cc',
       'tests/cefclient/browser/root_window_win.h',
       'tests/cefclient/browser/temp_window_win.cc',
       'tests/cefclient/browser/temp_window_win.h',
       'tests/cefclient/browser/util_win.cc',
       'tests/cefclient/browser/util_win.h',
-      'tests/cefclient/browser/window_test_win.cc',
+      'tests/cefclient/browser/views_window.cc',
+      'tests/cefclient/browser/views_window.h',
+      'tests/cefclient/browser/window_test_runner_views.cc',
+      'tests/cefclient/browser/window_test_runner_views.h',
+      'tests/cefclient/browser/window_test_runner_win.cc',
+      'tests/cefclient/browser/window_test_runner_win.h',
       'tests/cefclient/cefclient_win.cc',
       'tests/cefclient/resources/win/cefclient.exe.manifest',
       'tests/cefclient/resources/win/cefclient.ico',
@@ -259,13 +287,15 @@
       'tests/cefclient/browser/browser_window_std_mac.h',
       'tests/cefclient/browser/browser_window_std_mac.mm',
       'tests/cefclient/browser/main_context_impl_posix.cc',
+      'tests/cefclient/browser/main_message_loop_external_pump_mac.mm',
       'tests/cefclient/browser/resource_util_mac.mm',
       'tests/cefclient/browser/resource_util_posix.cc',
       'tests/cefclient/browser/root_window_mac.h',
       'tests/cefclient/browser/root_window_mac.mm',
       'tests/cefclient/browser/temp_window_mac.h',
       'tests/cefclient/browser/temp_window_mac.mm',
-      'tests/cefclient/browser/window_test_mac.mm',
+      'tests/cefclient/browser/window_test_runner_mac.h',
+      'tests/cefclient/browser/window_test_runner_mac.mm',
       'tests/cefclient/cefclient_mac.mm',
       '<@(cefclient_sources_browser)',
       '<@(cefclient_sources_common)',
@@ -290,15 +320,23 @@
       'tests/cefclient/browser/dialog_handler_gtk.cc',
       'tests/cefclient/browser/dialog_handler_gtk.h',
       'tests/cefclient/browser/main_context_impl_posix.cc',
+      'tests/cefclient/browser/main_message_loop_external_pump_linux.cc',
       'tests/cefclient/browser/print_handler_gtk.cc',
       'tests/cefclient/browser/print_handler_gtk.h',
       'tests/cefclient/browser/resource_util_linux.cc',
       'tests/cefclient/browser/resource_util_posix.cc',
       'tests/cefclient/browser/root_window_gtk.cc',
       'tests/cefclient/browser/root_window_gtk.h',
+      'tests/cefclient/browser/root_window_views.cc',
+      'tests/cefclient/browser/root_window_views.h',
       'tests/cefclient/browser/temp_window_x11.cc',
       'tests/cefclient/browser/temp_window_x11.h',
-      'tests/cefclient/browser/window_test_gtk.cc',
+      'tests/cefclient/browser/views_window.cc',
+      'tests/cefclient/browser/views_window.h',
+      'tests/cefclient/browser/window_test_runner_gtk.cc',
+      'tests/cefclient/browser/window_test_runner_gtk.h',
+      'tests/cefclient/browser/window_test_runner_views.cc',
+      'tests/cefclient/browser/window_test_runner_views.h',
       'tests/cefclient/cefclient_gtk.cc',
       '<@(cefclient_sources_browser)',
       '<@(cefclient_sources_common)',

cmake/FindCEF.cmake.in

@@ -0,0 +1,39 @@
+# Copyright (c) 2016 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.
+
+#
+# This file is the CEF CMake configuration entry point and should be loaded
+# using `find_package(CEF REQUIRED)`. See the top-level CMakeLists.txt file
+# included with the CEF binary distribution for usage information.
+#
+
+# Find the CEF binary distribution root directory.
+set(_CEF_ROOT "")
+if(CEF_ROOT AND IS_DIRECTORY "${CEF_ROOT}")
+  set(_CEF_ROOT "${CEF_ROOT}")
+  set(_CEF_ROOT_EXPLICIT 1)
+else()
+  set(_ENV_CEF_ROOT "")
+  if(DEFINED ENV{CEF_ROOT})
+    file(TO_CMAKE_PATH "$ENV{CEF_ROOT}" _ENV_CEF_ROOT)
+  endif()
+  if(_ENV_CEF_ROOT AND IS_DIRECTORY "${_ENV_CEF_ROOT}")
+    set(_CEF_ROOT "${_ENV_CEF_ROOT}")
+    set(_CEF_ROOT_EXPLICIT 1)
+  endif()
+  unset(_ENV_CEF_ROOT)
+endif()
+
+if(NOT DEFINED _CEF_ROOT_EXPLICIT)
+  message(FATAL_ERROR "Must specify a CEF_ROOT value via CMake or environment variable.")
+endif()
+
+if(NOT IS_DIRECTORY "${_CEF_ROOT}/cmake")
+  message(FATAL_ERROR "No CMake bootstrap found for CEF binary distribution at: ${CEF_ROOT}.")
+endif()
+
+# Execute additional cmake files from the CEF binary distribution.
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${_CEF_ROOT}/cmake")
+include("cef_variables")
+include("cef_macros")

cmake/cef_macros.cmake.in

@@ -0,0 +1,387 @@
+# Copyright (c) 2016 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.
+
+# Must be loaded via FindCEF.cmake.
+if(NOT DEFINED _CEF_ROOT_EXPLICIT)
+  message(FATAL_ERROR "Use find_package(CEF) to load this file.")
+endif()
+
+
+#
+# Shared macros.
+#
+
+# Print the current CEF configuration.
+macro(PRINT_CEF_CONFIG)
+  message(STATUS "*** CEF CONFIGURATION SETTINGS ***")
+  message(STATUS "Generator:                    ${CMAKE_GENERATOR}")
+  message(STATUS "Platform:                     ${CMAKE_SYSTEM_NAME}")
+  message(STATUS "Project architecture:         ${PROJECT_ARCH}")
+
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    message(STATUS "Build type:                   ${CMAKE_BUILD_TYPE}")
+  endif()
+
+  message(STATUS "Binary distribution root:     ${_CEF_ROOT}")
+
+  if(OS_MACOSX)
+    message(STATUS "Base SDK:                     ${CMAKE_OSX_SYSROOT}")
+    message(STATUS "Target SDK:                   ${CEF_TARGET_SDK}")
+  endif()
+
+  if(OS_WINDOWS)
+    message(STATUS "CEF Windows sandbox:          ${USE_SANDBOX}")
+    message(STATUS "Visual Studio ATL support:    ${USE_ATL}")
+  endif()
+
+  set(_libraries ${CEF_STANDARD_LIBS})
+  if(OS_WINDOWS AND USE_SANDBOX)
+    list(APPEND _libraries ${CEF_SANDBOX_STANDARD_LIBS})
+  endif()
+  message(STATUS "Standard libraries:           ${_libraries}")
+
+  message(STATUS "Compile defines:              ${CEF_COMPILER_DEFINES}")
+  message(STATUS "Compile defines (Debug):      ${CEF_COMPILER_DEFINES_DEBUG}")
+  message(STATUS "Compile defines (Release):    ${CEF_COMPILER_DEFINES_RELEASE}")
+  message(STATUS "C compile flags:              ${CEF_COMPILER_FLAGS} ${CEF_C_COMPILER_FLAGS}")
+  message(STATUS "C compile flags (Debug):      ${CEF_COMPILER_FLAGS_DEBUG} ${CEF_C_COMPILER_FLAGS_DEBUG}")
+  message(STATUS "C compile flags (Release):    ${CEF_COMPILER_FLAGS_RELEASE} ${CEF_C_COMPILER_FLAGS_RELEASE}")
+  message(STATUS "C++ compile flags:            ${CEF_COMPILER_FLAGS} ${CEF_CXX_COMPILER_FLAGS}")
+  message(STATUS "C++ compile flags (Debug):    ${CEF_COMPILER_FLAGS_DEBUG} ${CEF_CXX_COMPILER_FLAGS_DEBUG}")
+  message(STATUS "C++ compile flags (Release):  ${CEF_COMPILER_FLAGS_RELEASE} ${CEF_CXX_COMPILER_FLAGS_RELEASE}")
+  message(STATUS "Exe link flags:               ${CEF_LINKER_FLAGS} ${CEF_EXE_LINKER_FLAGS}")
+  message(STATUS "Exe link flags (Debug):       ${CEF_LINKER_FLAGS_DEBUG} ${CEF_EXE_LINKER_FLAGS_DEBUG}")
+  message(STATUS "Exe link flags (Release):     ${CEF_LINKER_FLAGS_RELEASE} ${CEF_EXE_LINKER_FLAGS_RELEASE}")
+  message(STATUS "Shared link flags:            ${CEF_LINKER_FLAGS} ${CEF_SHARED_LINKER_FLAGS}")
+  message(STATUS "Shared link flags (Debug):    ${CEF_LINKER_FLAGS_DEBUG} ${CEF_SHARED_LINKER_FLAGS_DEBUG}")
+  message(STATUS "Shared link flags (Release):  ${CEF_LINKER_FLAGS_RELEASE} ${CEF_SHARED_LINKER_FLAGS_RELEASE}")
+
+  if(OS_LINUX OR OS_WINDOWS)
+    message(STATUS "CEF Binary files:             ${CEF_BINARY_FILES}")
+    message(STATUS "CEF Resource files:           ${CEF_RESOURCE_FILES}")
+  endif()
+endmacro()
+
+# Append platform specific sources to a list of sources.
+macro(APPEND_PLATFORM_SOURCES name_of_list)
+  if(OS_LINUX AND ${name_of_list}_LINUX)
+    list(APPEND ${name_of_list} ${${name_of_list}_LINUX})
+  endif()
+  if(OS_POSIX AND ${name_of_list}_POSIX)
+    list(APPEND ${name_of_list} ${${name_of_list}_POSIX})
+  endif()
+  if(OS_WINDOWS AND ${name_of_list}_WINDOWS)
+    list(APPEND ${name_of_list} ${${name_of_list}_WINDOWS})
+  endif()
+  if(OS_MACOSX AND ${name_of_list}_MACOSX)
+    list(APPEND ${name_of_list} ${${name_of_list}_MACOSX})
+  endif()
+endmacro()
+
+# Determine the target output directory based on platform and generator.
+macro(SET_CEF_TARGET_OUT_DIR)
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR
+     ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    # By default Ninja and Make builds don't create a subdirectory named after
+    # the configuration.
+    set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
+
+    # Output binaries (executables, libraries) to the correct directory.
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
+  else()
+    set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
+  endif()
+endmacro()
+
+# Copy a list of files from one directory to another. Relative files paths are maintained.
+macro(COPY_FILES target file_list source_dir target_dir)
+  foreach(FILENAME ${file_list})
+    set(source_file ${source_dir}/${FILENAME})
+    set(target_file ${target_dir}/${FILENAME})
+    if(IS_DIRECTORY ${source_file})
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${source_file}" "${target_file}"
+        VERBATIM
+        )
+    else()
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${source_file}" "${target_file}"
+        VERBATIM
+        )
+    endif()
+  endforeach()
+endmacro()
+
+# Rename a directory replacing the target if it already exists.
+macro(RENAME_DIRECTORY target source_dir target_dir)
+  add_custom_command(
+    TARGET ${target}
+    POST_BUILD
+    # Remove the target directory if it already exists.
+    COMMAND ${CMAKE_COMMAND} -E remove_directory "${target_dir}"
+    # Rename the source directory to target directory.
+    COMMAND ${CMAKE_COMMAND} -E rename "${source_dir}" "${target_dir}"
+    VERBATIM
+    )
+endmacro()
+
+
+#
+# Linux macros.
+#
+
+if(OS_LINUX)
+
+# Use pkg-config to find Linux libraries and update compiler/linker variables.
+macro(FIND_LINUX_LIBRARIES libraries)
+  # Read pkg-config info into variables.
+  execute_process(COMMAND pkg-config --cflags ${libraries} OUTPUT_VARIABLE FLL_CFLAGS)
+  execute_process(COMMAND pkg-config --libs-only-L --libs-only-other ${libraries} OUTPUT_VARIABLE FLL_LDFLAGS)
+  execute_process(COMMAND pkg-config --libs-only-l ${libraries} OUTPUT_VARIABLE FLL_LIBS)
+
+  # Strip leading and trailing whitepspace.
+  STRING(STRIP "${FLL_CFLAGS}"  FLL_CFLAGS)
+  STRING(STRIP "${FLL_LDFLAGS}" FLL_LDFLAGS)
+  STRING(STRIP "${FLL_LIBS}"    FLL_LIBS)
+
+  # Convert to a list.
+  separate_arguments(FLL_CFLAGS)
+  separate_arguments(FLL_LDFLAGS)
+  separate_arguments(FLL_LIBS)
+
+  # Update build variables.
+  list(APPEND CEF_C_COMPILER_FLAGS    ${FLL_CFLAGS})
+  list(APPEND CEF_CXX_COMPILER_FLAGS  ${FLL_CFLAGS})
+  list(APPEND CEF_EXE_LINKER_FLAGS    ${FLL_LDFLAGS})
+  list(APPEND CEF_SHARED_LINKER_FLAGS ${FLL_LDFLAGS})
+  list(APPEND CEF_STANDARD_LIBS       ${FLL_LIBS})
+endmacro()
+
+# Set SUID permissions on the specified executable.
+macro(SET_LINUX_SUID_PERMISSIONS target executable)
+  add_custom_command(
+    TARGET ${target}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E echo ""
+    COMMAND ${CMAKE_COMMAND} -E echo "*** Run the following command manually to set SUID permissions ***"
+    COMMAND ${CMAKE_COMMAND} -E echo "EXE=\"${executable}\" && sudo -- chown root:root $EXE && sudo -- chmod 4755 $EXE"
+    COMMAND ${CMAKE_COMMAND} -E echo ""
+    VERBATIM
+    )
+endmacro()
+
+endif(OS_LINUX)
+
+
+#
+# Mac OS X macros.
+#
+
+if(OS_MACOSX)
+
+# Fix the framework link in the helper executable.
+macro(FIX_MACOSX_HELPER_FRAMEWORK_LINK target app_path)
+  add_custom_command(TARGET ${target}
+    POST_BUILD
+    COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework"
+            "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework"
+            "${app_path}/Contents/MacOS/${target}"
+    VERBATIM
+    )
+endmacro()
+
+# Fix the framework link in the main executable.
+macro(FIX_MACOSX_MAIN_FRAMEWORK_LINK target app_path)
+  add_custom_command(TARGET ${target}
+    POST_BUILD
+    COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework"
+            "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework"
+            "${app_path}/Contents/MacOS/${target}"
+    VERBATIM
+    )
+endmacro()
+
+# Manually process and copy over resource files.
+macro(COPY_MACOSX_RESOURCES resource_list prefix_list target source_dir app_path)
+  foreach(FILENAME ${resource_list})
+    # Remove one or more prefixes from the source paths.
+    set(TARGET_FILENAME "${FILENAME}")
+    foreach(PREFIX ${prefix_list})
+      string(REGEX REPLACE "^.*${PREFIX}" "" TARGET_FILENAME ${TARGET_FILENAME})
+    endforeach()
+
+    # Determine the absolute source and target paths.
+    set(TARGET_PATH "${app_path}/Contents/Resources/${TARGET_FILENAME}")
+    if(IS_ABSOLUTE ${FILENAME})
+      set(SOURCE_PATH ${FILENAME})
+    else()
+      set(SOURCE_PATH "${source_dir}/${FILENAME}")
+    endif()
+
+    if(${FILENAME} MATCHES ".xib$")
+      # Change the target file extension.
+      string(REGEX REPLACE ".xib$" ".nib" TARGET_PATH ${TARGET_PATH})
+
+      get_filename_component(TARGET_DIRECTORY ${TARGET_PATH} PATH)
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        # Create the target directory.
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${TARGET_DIRECTORY}"
+        # Compile the XIB file to a NIB.
+        COMMAND /usr/bin/ibtool --output-format binary1 --compile "${TARGET_PATH}" "${SOURCE_PATH}"
+        VERBATIM
+        )
+    elseif(NOT ${TARGET_FILENAME} STREQUAL "Info.plist")
+      # Copy the file as-is.
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy "${SOURCE_PATH}" "${TARGET_PATH}"
+        VERBATIM
+        )
+    endif()
+  endforeach()
+endmacro()
+
+endif(OS_MACOSX)
+
+
+#
+# Windows macros.
+#
+
+if(OS_WINDOWS)
+
+# Add custom manifest files to an executable target.
+macro(ADD_WINDOWS_MANIFEST manifest_path target extension)
+  add_custom_command(
+    TARGET ${target}
+    POST_BUILD
+    COMMAND "mt.exe" -nologo
+            -manifest \"${manifest_path}/${target}.${extension}.manifest\" \"${manifest_path}/compatibility.manifest\"
+            -outputresource:"${CEF_TARGET_OUT_DIR}/${target}.${extension}"\;\#1
+    COMMENT "Adding manifest..."
+    )
+endmacro()
+
+endif(OS_WINDOWS)
+
+
+#
+# Target configuration macros.
+#
+
+# Add a logical target that can be used to link the specified libraries into an
+# executable target.
+macro(ADD_LOGICAL_TARGET target debug_lib release_lib)
+  add_library(${target} ${CEF_LIBTYPE} IMPORTED)
+  set_target_properties(${target} PROPERTIES
+    IMPORTED_LOCATION "${release_lib}"
+    IMPORTED_LOCATION_DEBUG "${debug_lib}"
+    IMPORTED_LOCATION_RELEASE "${release_lib}"
+    )
+endmacro()
+
+# Set common target properties. Use SET_LIBRARY_TARGET_PROPERTIES() or
+# SET_EXECUTABLE_TARGET_PROPERTIES() instead of calling this macro directly.
+macro(SET_COMMON_TARGET_PROPERTIES target)
+  # Compile flags.
+  target_compile_options(${target} PUBLIC ${CEF_COMPILER_FLAGS} ${CEF_CXX_COMPILER_FLAGS})
+  target_compile_options(${target} PUBLIC $<$<CONFIG:Debug>:${CEF_COMPILER_FLAGS_DEBUG} ${CEF_CXX_COMPILER_FLAGS_DEBUG}>)
+  target_compile_options(${target} PUBLIC $<$<CONFIG:Release>:${CEF_COMPILER_FLAGS_RELEASE} ${CEF_CXX_COMPILER_FLAGS_RELEASE}>)
+
+  # Compile definitions.
+  target_compile_definitions(${target} PUBLIC ${CEF_COMPILER_DEFINES})
+  target_compile_definitions(${target} PUBLIC $<$<CONFIG:Debug>:${CEF_COMPILER_DEFINES_DEBUG}>)
+  target_compile_definitions(${target} PUBLIC $<$<CONFIG:Release>:${CEF_COMPILER_DEFINES_RELEASE}>)
+
+  # Include directories.
+  target_include_directories(${target} PUBLIC ${CEF_INCLUDE_PATH})
+
+  # Linker flags.
+  if(CEF_LINKER_FLAGS)
+    string(REPLACE ";" " " _flags_str "${CEF_LINKER_FLAGS}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS ${_flags_str})
+  endif()
+  if(CEF_LINKER_FLAGS_DEBUG)
+    string(REPLACE ";" " " _flags_str "${CEF_LINKER_FLAGS_DEBUG}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS_DEBUG ${_flags_str})
+  endif()
+  if(CEF_LINKER_FLAGS_RELEASE)
+    string(REPLACE ";" " " _flags_str "${CEF_LINKER_FLAGS_RELEASE}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
+  endif()
+
+  if(OS_MACOSX)
+    # Set Xcode target properties.
+    set_target_properties(${target} PROPERTIES
+      XCODE_ATTRIBUTE_ALWAYS_SEARCH_USER_PATHS                    NO
+      XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD                 "gnu++11"   # -std=gnu++11
+      XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME                     NO          # -fno-objc-link-runtime
+      XCODE_ATTRIBUTE_CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS  YES         # -Wobjc-missing-property-synthesis
+      XCODE_ATTRIBUTE_COPY_PHASE_STRIP                            NO
+      XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING[variant=Release]        YES         # -Wl,-dead_strip
+      XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD                     "c99"       # -std=c99
+      XCODE_ATTRIBUTE_GCC_CW_ASM_SYNTAX                           NO          # No -fasm-blocks
+      XCODE_ATTRIBUTE_GCC_DYNAMIC_NO_PIC                          NO
+      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS                   NO          # -fno-exceptions
+      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_RTTI                         NO          # -fno-rtti
+      XCODE_ATTRIBUTE_GCC_ENABLE_PASCAL_STRINGS                   NO          # No -mpascal-strings
+      XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN              YES         # -fvisibility-inlines-hidden
+      XCODE_ATTRIBUTE_GCC_OBJC_CALL_CXX_CDTORS                    YES         # -fobjc-call-cxx-cdtors
+      XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN                  YES         # -fvisibility=hidden
+      XCODE_ATTRIBUTE_GCC_THREADSAFE_STATICS                      NO          # -fno-threadsafe-statics
+      XCODE_ATTRIBUTE_GCC_TREAT_WARNINGS_AS_ERRORS                YES         # -Werror
+      XCODE_ATTRIBUTE_GCC_VERSION                                 "com.apple.compilers.llvm.clang.1_0"
+      XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_NEWLINE              YES         # -Wnewline-eof
+      XCODE_ATTRIBUTE_USE_HEADERMAP                               NO
+      OSX_ARCHITECTURES_DEBUG                                     "${CMAKE_OSX_ARCHITECTURES}"
+      OSX_ARCHITECTURES_RELEASE                                   "${CMAKE_OSX_ARCHITECTURES}"
+      )
+  endif()
+endmacro()
+
+# Set library-specific properties.
+macro(SET_LIBRARY_TARGET_PROPERTIES target)
+  SET_COMMON_TARGET_PROPERTIES(${target})
+
+  # Shared library linker flags.
+  if(CEF_SHARED_LINKER_FLAGS)
+    string(REPLACE ";" " " _flags_str "${CEF_SHARED_LINKER_FLAGS}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS ${_flags_str})
+  endif()
+  if(CEF_SHARED_LINKER_FLAGS_DEBUG)
+    string(REPLACE ";" " " _flags_str "${CEF_SHARED_LINKER_FLAGS_DEBUG}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS_DEBUG ${_flags_str})
+  endif()
+  if(CEF_SHARED_LINKER_FLAGS_RELEASE)
+    string(REPLACE ";" " " _flags_str "${CEF_SHARED_LINKER_FLAGS_RELEASE}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
+  endif()
+endmacro()
+
+# Set executable-specific properties.
+macro(SET_EXECUTABLE_TARGET_PROPERTIES target)
+  SET_COMMON_TARGET_PROPERTIES(${target})
+
+  # Executable linker flags.
+  if(CEF_EXE_LINKER_FLAGS)
+    string(REPLACE ";" " " _flags_str "${CEF_EXE_LINKER_FLAGS}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS ${_flags_str})
+  endif()
+  if(CEF_EXE_LINKER_FLAGS_DEBUG)
+    string(REPLACE ";" " " _flags_str "${CEF_EXE_LINKER_FLAGS_DEBUG}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS_DEBUG ${_flags_str})
+  endif()
+  if(CEF_EXE_LINKER_FLAGS_RELEASE)
+    string(REPLACE ";" " " _flags_str "${CEF_EXE_LINKER_FLAGS_RELEASE}")
+    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
+  endif()
+endmacro()

cmake/cef_variables.cmake.in

@@ -0,0 +1,441 @@
+# Copyright (c) 2016 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.
+
+# Must be loaded via FindCEF.cmake.
+if(NOT DEFINED _CEF_ROOT_EXPLICIT)
+  message(FATAL_ERROR "Use find_package(CEF) to load this file.")
+endif()
+
+
+#
+# Shared configuration.
+#
+
+# Determine the platform.
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  set(OS_MACOSX 1)
+  set(OS_POSIX 1)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  set(OS_LINUX 1)
+  set(OS_POSIX 1)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  set(OS_WINDOWS 1)
+endif()
+
+# Determine the project architecture.
+if(NOT DEFINED PROJECT_ARCH)
+  if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+    set(PROJECT_ARCH "x86_64")
+  else()
+    set(PROJECT_ARCH "x86")
+  endif()
+
+  if(OS_MACOSX)
+    # PROJECT_ARCH should be specified on Mac OS X.
+    message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
+  endif()
+endif()
+
+# Determine the build type.
+if(NOT CMAKE_BUILD_TYPE AND
+   (${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles"))
+  # CMAKE_BUILD_TYPE should be specified when using Ninja or Unix Makefiles.
+  set(CMAKE_BUILD_TYPE Release)
+  message(WARNING "No CMAKE_BUILD_TYPE value selected, using ${CMAKE_BUILD_TYPE}")
+endif()
+
+
+# Path to the include directory.
+set(CEF_INCLUDE_PATH "${_CEF_ROOT}")
+
+# Path to the libcef_dll_wrapper target.
+set(CEF_LIBCEF_DLL_WRAPPER_PATH "${_CEF_ROOT}/libcef_dll")
+
+
+# Shared compiler/linker flags.
+list(APPEND CEF_COMPILER_DEFINES
+  # Allow C++ programs to use stdint.h macros specified in the C99 standard that aren't 
+  # in the C++ standard (e.g. UINT8_MAX, INT64_MIN, etc)
+  __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS
+  )
+
+
+#
+# Linux configuration.
+#
+
+if(OS_LINUX)
+  # Platform-specific compiler/linker flags.
+  set(CEF_LIBTYPE SHARED)
+  list(APPEND CEF_COMPILER_FLAGS
+    -fno-strict-aliasing            # Avoid assumptions regarding non-aliasing of objects of different types
+    -fPIC                           # Generate position-independent code for shared libraries
+    -fstack-protector               # Protect some vulnerable functions from stack-smashing (security feature)
+    -funwind-tables                 # Support stack unwinding for backtrace()
+    -fvisibility=hidden             # Give hidden visibility to declarations that are not explicitly marked as visible
+    --param=ssp-buffer-size=4       # Set the minimum buffer size protected by SSP (security feature, related to stack-protector)
+    -pipe                           # Use pipes rather than temporary files for communication between build stages
+    -pthread                        # Use the pthread library
+    -Wall                           # Enable all warnings
+    -Werror                         # Treat warnings as errors
+    -Wno-missing-field-initializers # Don't warn about missing field initializers
+    -Wno-unused-parameter           # Don't warn about unused parameters
+    )
+  list(APPEND CEF_C_COMPILER_FLAGS
+    -std=c99                        # Use the C99 language standard
+    )
+  list(APPEND CEF_CXX_COMPILER_FLAGS
+    -fno-exceptions                 # Disable exceptions
+    -fno-rtti                       # Disable real-time type information
+    -fno-threadsafe-statics         # Don't generate thread-safe statics
+    -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
+    -std=gnu++11                    # Use the C++11 language standard including GNU extensions
+    -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
+    )
+  list(APPEND CEF_COMPILER_FLAGS_DEBUG
+    -O0                             # Disable optimizations
+    -g                              # Generate debug information
+    )
+  list(APPEND CEF_COMPILER_FLAGS_RELEASE
+    -O2                             # Optimize for maximum speed
+    -fdata-sections                 # Enable linker optimizations to improve locality of reference for data sections
+    -ffunction-sections             # Enable linker optimizations to improve locality of reference for function sections
+    -fno-ident                      # Ignore the #ident directive
+    -U_FORTIFY_SOURCE               # Undefine _FORTIFY_SOURCE in case it was previously defined
+    -D_FORTIFY_SOURCE=2             # Add memory and string function protection (security feature, related to stack-protector)
+    )
+  list(APPEND CEF_LINKER_FLAGS
+    -fPIC                           # Generate position-independent code for shared libraries
+    -pthread                        # Use the pthread library
+    -Wl,--disable-new-dtags         # Don't generate new-style dynamic tags in ELF
+    -Wl,--fatal-warnings            # Treat warnings as errors
+    -Wl,-rpath,.                    # Set rpath so that libraries can be placed next to the executable
+    -Wl,-z,noexecstack              # Mark the stack as non-executable (security feature)
+    -Wl,-z,now                      # Resolve symbols on program start instead of on first use (security feature)
+    -Wl,-z,relro                    # Mark relocation sections as read-only (security feature)
+    )
+  list(APPEND CEF_LINKER_FLAGS_RELEASE
+    -Wl,-O1                         # Enable linker optimizations
+    -Wl,--as-needed                 # Only link libraries that export symbols used by the binary
+    -Wl,--gc-sections               # Remove unused code resulting from -fdata-sections and -function-sections
+    )
+  list(APPEND CEF_COMPILER_DEFINES
+    _FILE_OFFSET_BITS=64            # Allow the Large File Support (LFS) interface to replace the old interface
+    )
+  list(APPEND CEF_COMPILER_DEFINES_RELEASE
+    NDEBUG                          # Not a debug build
+    )
+
+  include(CheckCCompilerFlag)
+  include(CheckCXXCompilerFlag)
+
+  CHECK_C_COMPILER_FLAG(-Wno-unused-local-typedefs COMPILER_SUPPORTS_NO_UNUSED_LOCAL_TYPEDEFS)
+  if(COMPILER_SUPPORTS_NO_UNUSED_LOCAL_TYPEDEFS)
+    list(APPEND CEF_C_COMPILER_FLAGS
+      -Wno-unused-local-typedefs  # Don't warn about unused local typedefs
+      )
+  endif()
+
+  CHECK_CXX_COMPILER_FLAG(-Wno-literal-suffix COMPILER_SUPPORTS_NO_LITERAL_SUFFIX)
+  if(COMPILER_SUPPORTS_NO_LITERAL_SUFFIX)
+    list(APPEND CEF_CXX_COMPILER_FLAGS
+      -Wno-literal-suffix         # Don't warn about invalid suffixes on literals
+      )
+  endif()
+
+  CHECK_CXX_COMPILER_FLAG(-Wno-narrowing COMPILER_SUPPORTS_NO_NARROWING)
+  if(COMPILER_SUPPORTS_NO_NARROWING)
+    list(APPEND CEF_CXX_COMPILER_FLAGS
+      -Wno-narrowing              # Don't warn about type narrowing
+      )
+  endif()
+
+  if(PROJECT_ARCH STREQUAL "x86_64")
+    # 64-bit architecture.
+    list(APPEND CEF_COMPILER_FLAGS
+      -m64
+      -march=x86-64
+      )
+    list(APPEND CEF_LINKER_FLAGS
+      -m64
+      )
+  elseif(PROJECT_ARCH STREQUAL "x86")
+    # 32-bit architecture.
+    list(APPEND CEF_COMPILER_FLAGS
+      -msse2
+      -mfpmath=sse
+      -mmmx
+      -m32
+      )
+    list(APPEND CEF_LINKER_FLAGS
+      -m32
+      )
+  endif()
+
+  # Standard libraries.
+  set(CEF_STANDARD_LIBS
+    X11
+    )
+
+  # CEF directory paths.
+  set(CEF_RESOURCE_DIR        "${_CEF_ROOT}/Resources")
+  set(CEF_BINARY_DIR          "${_CEF_ROOT}/${CMAKE_BUILD_TYPE}")
+  set(CEF_BINARY_DIR_DEBUG    "${_CEF_ROOT}/Debug")
+  set(CEF_BINARY_DIR_RELEASE  "${_CEF_ROOT}/Release")
+
+  # CEF library paths.
+  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/libcef.so")
+  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.so")
+
+  # List of CEF binary files.
+  set(CEF_BINARY_FILES
+    chrome-sandbox
+    libcef.so
+    natives_blob.bin
+    snapshot_blob.bin
+    )
+
+  # List of CEF resource files.
+  set(CEF_RESOURCE_FILES
+    cef.pak
+    cef_100_percent.pak
+    cef_200_percent.pak
+    cef_extensions.pak
+    devtools_resources.pak
+    icudtl.dat
+    locales
+    )
+endif()
+
+
+#
+# Mac OS X configuration.
+#
+
+if(OS_MACOSX)
+  # Platform-specific compiler/linker flags.
+  # See also Xcode target properties in macros.cmake.
+  set(CEF_LIBTYPE SHARED)
+  list(APPEND CEF_COMPILER_FLAGS
+    -fno-strict-aliasing            # Avoid assumptions regarding non-aliasing of objects of different types
+    -fstack-protector               # Protect some vulnerable functions from stack-smashing (security feature)
+    -funwind-tables                 # Support stack unwinding for backtrace()
+    -fvisibility=hidden             # Give hidden visibility to declarations that are not explicitly marked as visible
+    -Wall                           # Enable all warnings
+    -Werror                         # Treat warnings as errors
+    -Wextra                         # Enable additional warnings
+    -Wendif-labels                  # Warn whenever an #else or an #endif is followed by text
+    -Wnewline-eof                   # Warn about no newline at end of file
+    -Wno-missing-field-initializers # Don't warn about missing field initializers
+    -Wno-unused-parameter           # Don't warn about unused parameters
+    )
+  list(APPEND CEF_C_COMPILER_FLAGS
+    -std=c99                        # Use the C99 language standard
+    )
+  list(APPEND CEF_CXX_COMPILER_FLAGS
+    -fno-exceptions                 # Disable exceptions
+    -fno-rtti                       # Disable real-time type information
+    -fno-threadsafe-statics         # Don't generate thread-safe statics
+    -fobjc-call-cxx-cdtors          # Call the constructor/destructor of C++ instance variables in ObjC objects
+    -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
+    -std=gnu++11                    # Use the C++11 language standard including GNU extensions
+    -Wno-narrowing                  # Don't warn about type narrowing
+    -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
+    )
+  list(APPEND CEF_COMPILER_FLAGS_DEBUG
+    -O0                             # Disable optimizations
+    -g                              # Generate debug information
+    )
+  list(APPEND CEF_COMPILER_FLAGS_RELEASE
+    -O3                             # Optimize for maximum speed plus a few extras
+    )
+  list(APPEND CEF_LINKER_FLAGS
+    -Wl,-search_paths_first         # Search for static or shared library versions in the same pass
+    -Wl,-ObjC                       # Support creation of ObjC static libraries
+    -Wl,-pie                        # Generate position-independent code suitable for executables only
+    )
+  list(APPEND CEF_LINKER_FLAGS_RELEASE
+    -Wl,-dead_strip                 # Strip dead code
+    )
+
+  # Standard libraries.
+  set(CEF_STANDARD_LIBS
+    -lpthread
+    "-framework Cocoa"
+    "-framework AppKit"
+    )
+
+  # Find the newest available base SDK.
+  execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+  foreach(OS_VERSION 10.10 10.9 10.8 10.7)
+    set(SDK "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OS_VERSION}.sdk")
+    if(NOT "${CMAKE_OSX_SYSROOT}" AND EXISTS "${SDK}" AND IS_DIRECTORY "${SDK}")
+      set(CMAKE_OSX_SYSROOT ${SDK})
+    endif()
+  endforeach()
+
+  # Target SDK.
+  set(CEF_TARGET_SDK               "10.7")
+  list(APPEND CEF_COMPILER_FLAGS
+    -mmacosx-version-min=${CEF_TARGET_SDK}
+  )
+  set(CMAKE_OSX_DEPLOYMENT_TARGET  ${CEF_TARGET_SDK})
+
+  # Target architecture.
+  if(PROJECT_ARCH STREQUAL "x86_64")
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  else()
+    set(CMAKE_OSX_ARCHITECTURES "i386")
+  endif()
+
+  # CEF directory paths.
+  set(CEF_BINARY_DIR          "${_CEF_ROOT}/$<CONFIGURATION>")
+  set(CEF_BINARY_DIR_DEBUG    "${_CEF_ROOT}/Debug")
+  set(CEF_BINARY_DIR_RELEASE  "${_CEF_ROOT}/Release")
+
+  # CEF library paths.
+  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/Chromium Embedded Framework.framework/Chromium Embedded Framework")
+  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/Chromium Embedded Framework.framework/Chromium Embedded Framework")
+endif()
+
+
+#
+# Windows configuration.
+#
+
+if(OS_WINDOWS)
+  # Consumers who run into LNK4099 warnings can pass /Z7 instead (see issue #385).
+  set(CEF_DEBUG_INFO_FLAG "/Zi" CACHE STRING "Optional flag specifying specific /Z flag to use")
+
+  # Platform-specific compiler/linker flags.
+  set(CEF_LIBTYPE STATIC)
+  list(APPEND CEF_COMPILER_FLAGS
+    /MP           # Multiprocess compilation
+    /Gy           # Enable function-level linking
+    /GR-          # Disable run-time type information
+    /W4           # Warning level 4
+    /WX           # Treat warnings as errors
+    /wd4100       # Ignore "unreferenced formal parameter" warning
+    /wd4127       # Ignore "conditional expression is constant" warning
+    /wd4244       # Ignore "conversion possible loss of data" warning
+    /wd4481       # Ignore "nonstandard extension used: override" warning
+    /wd4512       # Ignore "assignment operator could not be generated" warning
+    /wd4701       # Ignore "potentially uninitialized local variable" warning
+    /wd4702       # Ignore "unreachable code" warning
+    /wd4996       # Ignore "function or variable may be unsafe" warning
+    ${CEF_DEBUG_INFO_FLAG}
+    )
+  list(APPEND CEF_COMPILER_FLAGS_DEBUG
+    /MTd          # Multithreaded debug runtime
+    /RTC1         # Disable optimizations
+    /Od           # Enable basic run-time checks
+    )
+  list(APPEND CEF_COMPILER_FLAGS_RELEASE
+    /MT           # Multithreaded release runtime
+    /O2           # Optimize for maximum speed
+    /Ob2          # Inline any suitable function
+    /GF           # Enable string pooling
+    )
+  list(APPEND CEF_LINKER_FLAGS_DEBUG
+    /DEBUG        # Generate debug information
+    )
+  list(APPEND CEF_EXE_LINKER_FLAGS
+    /MANIFEST:NO  # No default manifest (see ADD_WINDOWS_MANIFEST macro usage)
+    )
+  list(APPEND CEF_COMPILER_DEFINES
+    WIN32 _WIN32 _WINDOWS             # Windows platform
+    UNICODE _UNICODE                  # Unicode build
+    WINVER=0x0602 _WIN32_WINNT=0x602  # Targeting Windows 8
+    NOMINMAX                          # Use the standard's templated min/max
+    WIN32_LEAN_AND_MEAN               # Exclude less common API declarations
+    _HAS_EXCEPTIONS=0                 # Disable exceptions
+    )
+  list(APPEND CEF_COMPILER_DEFINES_RELEASE
+    NDEBUG _NDEBUG                    # Not a debug build
+    )
+
+  # Standard libraries.
+  set(CEF_STANDARD_LIBS
+    comctl32.lib
+    rpcrt4.lib
+    shlwapi.lib
+    ws2_32.lib
+    )
+
+  # CEF directory paths.
+  set(CEF_RESOURCE_DIR        "${_CEF_ROOT}/Resources")
+  set(CEF_BINARY_DIR          "${_CEF_ROOT}/$<CONFIGURATION>")
+  set(CEF_BINARY_DIR_DEBUG    "${_CEF_ROOT}/Debug")
+  set(CEF_BINARY_DIR_RELEASE  "${_CEF_ROOT}/Release")
+
+  # CEF library paths.
+  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/libcef.lib")
+  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.lib")
+
+  # List of CEF binary files.
+  set(CEF_BINARY_FILES
+    d3dcompiler_43.dll
+    d3dcompiler_47.dll
+    libcef.dll
+    libEGL.dll
+    libGLESv2.dll
+    natives_blob.bin
+    snapshot_blob.bin
+    )
+
+  # List of CEF resource files.
+  set(CEF_RESOURCE_FILES
+    cef.pak
+    cef_100_percent.pak
+    cef_200_percent.pak
+    cef_extensions.pak
+    devtools_resources.pak
+    icudtl.dat
+    locales
+    )
+
+  # Configure use of the sandbox.
+  option(USE_SANDBOX "Enable or disable use of the sandbox." ON)
+  if(USE_SANDBOX AND NOT MSVC_VERSION EQUAL 1900)
+    # The cef_sandbox.lib static library is currently built with VS2015. It will
+    # not link successfully with other VS versions.
+    set(USE_SANDBOX OFF)
+  endif()
+
+  if(USE_SANDBOX)
+    list(APPEND CEF_COMPILER_DEFINES
+      PSAPI_VERSION=1   # Required by cef_sandbox.lib
+      CEF_USE_SANDBOX   # Used by apps to test if the sandbox is enabled
+      )
+
+    # Libraries required by cef_sandbox.lib.
+    set(CEF_SANDBOX_STANDARD_LIBS
+      dbghelp.lib
+      psapi.lib
+      version.lib
+      winmm.lib
+      )
+
+    # CEF sandbox library paths.
+    set(CEF_SANDBOX_LIB_DEBUG "${CEF_BINARY_DIR_DEBUG}/cef_sandbox.lib")
+    set(CEF_SANDBOX_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/cef_sandbox.lib")
+  endif()
+
+  # Configure use of ATL.
+  option(USE_ATL "Enable or disable use of ATL." ON)
+  if(USE_ATL)
+    # Determine if the Visual Studio install supports ATL.
+    get_filename_component(VC_BIN_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
+    get_filename_component(VC_DIR ${VC_BIN_DIR} DIRECTORY)
+    if(NOT IS_DIRECTORY "${VC_DIR}/atlmfc")
+      set(USE_ATL OFF)
+    endif()
+  endif()
+
+  if(USE_ATL)
+    list(APPEND CEF_COMPILER_DEFINES
+      CEF_USE_ATL   # Used by apps to test if ATL support is enabled
+      )
+  endif()
+endif()

include/base/cef_atomic_ref_count.h

@@ -44,10 +44,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/atomic_ref_count.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -121,6 +121,6 @@ inline bool AtomicRefCountIsZero(volatile AtomicRefCount *ptr) {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_

include/base/cef_atomicops.h

@@ -59,10 +59,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/atomicops.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -193,6 +193,6 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
 #include "include/base/internal/cef_atomicops_atomicword_compat.h"
 #endif
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_

include/base/cef_basictypes.h

@@ -32,14 +32,6 @@
 #define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
 #pragma once
 
-#if defined(BUILDING_CEF_SHARED)
-// When building CEF include the Chromium header directly.
-#include "base/basictypes.h"
-#else  // !BUILDING_CEF_SHARED
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
 #include <limits.h>         // For UINT_MAX
 #include <stddef.h>         // For size_t
 
@@ -72,15 +64,14 @@ typedef int                 int32;
 typedef unsigned int       uint32;
 #endif
 
-// UTF-16 character type
+// UTF-16 character type.
+// This should be kept synchronized with base/strings/string16.h
 #ifndef char16
-#if defined(WIN32)
+#if defined(WCHAR_T_IS_UTF16)
 typedef wchar_t             char16;
-#else
+#elif defined(WCHAR_T_IS_UTF32)
 typedef unsigned short      char16;
 #endif
 #endif
 
-#endif  // !BUILDING_CEF_SHARED
-
 #endif  // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_

include/base/cef_bind.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/bind.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -543,6 +543,6 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_BIND_H_

include/base/cef_bind_helpers.h

@@ -175,10 +175,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/bind_helpers.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -581,6 +581,6 @@ void DeletePointer(T* obj) {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_

include/base/cef_build.h

@@ -32,10 +32,10 @@
 #define CEF_INCLUDE_BASE_CEF_BUILD_H_
 #pragma once
 
-#if defined(BUILDING_CEF_SHARED)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/compiler_specific.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -132,26 +132,10 @@
 #error Please add support for your compiler in cef_build.h
 #endif
 
-// Annotate a virtual method indicating it must be overriding a virtual
-// method in the parent class.
-// Use like:
-//   virtual void foo() OVERRIDE;
-#ifndef OVERRIDE
-#if defined(__clang__) || defined(COMPILER_MSVC)
-#define OVERRIDE override
-#elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \
-      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
-// GCC 4.7 supports explicit virtual overrides when C++11 support is enabled.
-#define OVERRIDE override
-#else
-#define OVERRIDE
-#endif
-#endif  // OVERRIDE
-
 // Annotate a function indicating the caller must examine the return value.
 // Use like:
 //   int foo() WARN_UNUSED_RESULT;
-// To explicitly ignore a result, see |ignore_result()| in <base/basictypes.h>.
+// To explicitly ignore a result, see |ignore_result()| in <base/macros.h>.
 #ifndef WARN_UNUSED_RESULT
 #if defined(COMPILER_GCC)
 #define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
@@ -181,6 +165,28 @@
 #define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
 #endif
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
+
+// Annotate a virtual method indicating it must be overriding a virtual method
+// in the parent class.
+// Use like:
+//   void foo() OVERRIDE;
+// NOTE: This define should only be used in classes exposed to the client since
+// C++11 support may not be enabled in client applications. CEF internal classes
+// should use the `override` keyword directly.
+#ifndef OVERRIDE
+#if defined(__clang__)
+#define OVERRIDE override
+#elif defined(COMPILER_MSVC) && _MSC_VER >= 1600
+// Visual Studio 2010 and later support override.
+#define OVERRIDE override
+#elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \
+      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
+// GCC 4.7 supports explicit virtual overrides when C++11 support is enabled.
+#define OVERRIDE override
+#else
+#define OVERRIDE
+#endif
+#endif  // OVERRIDE
 
 #endif  // CEF_INCLUDE_BASE_CEF_BUILD_H_

include/base/cef_callback.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -802,6 +802,6 @@ typedef Callback<void(void)> Closure;
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_H_

include/base/cef_callback_forward.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback_forward.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -54,6 +54,6 @@ typedef Callback<void(void)> Closure;
 
 }  // namespace base
 
-#endif  // !!BUILDING_CEF_SHARED
+#endif  // !!USING_CHROMIUM_INCLUDES
 
 #endif  // INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_

include/base/cef_callback_helpers.h

@@ -46,10 +46,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback_helpers.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -88,6 +88,6 @@ class ScopedClosureRunner {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_

include/base/cef_callback_list.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/callback_list.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -439,6 +439,6 @@ class CallbackList<void(A1, A2, A3, A4, A5, A6, A7)>
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_

include/base/cef_cancelable_callback.h

@@ -74,10 +74,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/cancelable_callback.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -309,6 +309,6 @@ typedef CancelableCallback<void(void)> CancelableClosure;
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_

include/base/cef_lock.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/synchronization/lock.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -50,6 +50,7 @@
 #include "include/base/internal/cef_lock_impl.h"
 
 namespace base {
+namespace cef_internal {
 
 // A convenient wrapper for an OS specific critical section.  The only real
 // intelligence in this class is in debug mode for the support for the
@@ -113,7 +114,7 @@ class Lock {
 #endif  // NDEBUG
 
   // Platform specific underlying lock implementation.
-  cef_internal::LockImpl lock_;
+  LockImpl lock_;
 
   DISALLOW_COPY_AND_ASSIGN(Lock);
 };
@@ -160,8 +161,17 @@ class AutoUnlock {
   DISALLOW_COPY_AND_ASSIGN(AutoUnlock);
 };
 
+}  // namespace cef_internal
+
+// Implement classes in the cef_internal namespace and then expose them to the
+// base namespace. This avoids conflicts with the base.lib implementation when
+// linking sandbox support on Windows.
+using cef_internal::Lock;
+using cef_internal::AutoLock;
+using cef_internal::AutoUnlock;
+
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_LOCK_H_

include/base/cef_logging.h

@@ -141,10 +141,18 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+
+// Always define the DCHECK_IS_ON macro which is used from other CEF headers.
+#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
+#define DCHECK_IS_ON() 0
+#else
+#define DCHECK_IS_ON() 1
+#endif
+
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/logging.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -419,9 +427,9 @@ DEFINE_CHECK_OP_IMPL(GT, > )
 #endif
 
 #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-#define DCHECK_IS_ON 0
+#define DCHECK_IS_ON() 0
 #else
-#define DCHECK_IS_ON 1
+#define DCHECK_IS_ON() 1
 #endif
 
 // Definitions for DLOG et al.
@@ -475,14 +483,14 @@ enum { DEBUG_MODE = ENABLE_DLOG };
 
 // Definitions for DCHECK et al.
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 
 #define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
   COMPACT_GOOGLE_LOG_EX_FATAL(ClassName , ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_FATAL
 const LogSeverity LOG_DCHECK = LOG_FATAL;
 
-#else  // DCHECK_IS_ON
+#else  // DCHECK_IS_ON()
 
 // These are just dummy values.
 #define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
@@ -490,31 +498,29 @@ const LogSeverity LOG_DCHECK = LOG_FATAL;
 #define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_INFO
 const LogSeverity LOG_DCHECK = LOG_INFO;
 
-#endif  // DCHECK_IS_ON
+#endif  // DCHECK_IS_ON()
 
 // DCHECK et al. make sure to reference |condition| regardless of
 // whether DCHECKs are enabled; this is so that we don't get unused
 // variable warnings if the only use of a variable is in a DCHECK.
 // This behavior is different from DLOG_IF et al.
 
-#define DCHECK(condition)                                         \
-  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON && !(condition))   \
-  << "Check failed: " #condition ". "
+#define DCHECK(condition)                                           \
+  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition))   \
+      << "Check failed: " #condition ". "
 
-#define DPCHECK(condition)                                        \
-  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON && !(condition))  \
-  << "Check failed: " #condition ". "
+#define DPCHECK(condition)                                          \
+  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition))  \
+      << "Check failed: " #condition ". "
 
 // Helper macro for binary operators.
 // Don't use this macro directly in your code, use DCHECK_EQ et al below.
-#define DCHECK_OP(name, op, val1, val2)                         \
-  if (DCHECK_IS_ON)                                             \
-    if (std::string* _result =                                  \
-        cef::logging::Check##name##Impl((val1), (val2),              \
-                                   #val1 " " #op " " #val2))    \
-      cef::logging::LogMessage(                                      \
-          __FILE__, __LINE__, ::cef::logging::LOG_DCHECK,            \
-          _result).stream()
+#define DCHECK_OP(name, op, val1, val2)                                   \
+  if (DCHECK_IS_ON())                                                     \
+    if (std::string* _result = cef::logging::Check##name##Impl(           \
+            (val1), (val2), #val1 " " #op " " #val2))                     \
+  cef::logging::LogMessage(__FILE__, __LINE__,                            \
+      ::cef::logging::LOG_DCHECK, _result).stream()
 
 // Equality/Inequality checks - compare two values, and log a
 // LOG_DCHECK message including the two values when the result is not
@@ -741,6 +747,6 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
 EAT_STREAM_PARAMETERS
 #endif
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_LOGGING_H_

include/base/cef_macros.h

@@ -32,50 +32,31 @@
 #define CEF_INCLUDE_BASE_CEF_MACROS_H_
 #pragma once
 
-#if defined(BUILDING_CEF_SHARED)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/macros.h"
-#else  // !BUILDING_CEF_SHARED
+
+// Chromium uses movable types.
+#define MOVE_SCOPED_PTR(var) std::move(var)
+
+// Chromium uses std types.
+#define SCOPED_PTR(type) std::unique_ptr<type>
+#define DEFAULT_DELETER(type) std::default_delete<type>
+
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
 #include <stddef.h>  // For size_t.
+#include "include/base/cef_build.h"  // For COMPILER_MSVC
 
-#if !defined(ALLOW_THIS_IN_INITIALIZER_LIST)
-#if defined(COMPILER_MSVC)
+// CEF does not use movable types.
+#define MOVE_SCOPED_PTR(var) var.Pass()
 
-// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
-// The warning remains disabled until popped by MSVC_POP_WARNING.
-#define MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \
-                                     __pragma(warning(disable:n))
-
-// MSVC_PUSH_WARNING_LEVEL pushes |n| as the global warning level.  The level
-// remains in effect until popped by MSVC_POP_WARNING().  Use 0 to disable all
-// warnings.
-#define MSVC_PUSH_WARNING_LEVEL(n) __pragma(warning(push, n))
-
-// Pop effects of innermost MSVC_PUSH_* macro.
-#define MSVC_POP_WARNING() __pragma(warning(pop))
-
-// Allows |this| to be passed as an argument in constructor initializer lists.
-// This uses push/pop instead of the seemingly simpler suppress feature to avoid
-// having the warning be disabled for more than just |code|.
-//
-// Example usage:
-// Foo::Foo() : x(NULL), ALLOW_THIS_IN_INITIALIZER_LIST(y(this)), z(3) {}
-//
-// Compiler warning C4355: 'this': used in base member initializer list:
-// http://msdn.microsoft.com/en-us/library/3c594ae3(VS.80).aspx
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) MSVC_PUSH_DISABLE_WARNING(4355) \
-                                             code \
-                                             MSVC_POP_WARNING()
-#else  // !COMPILER_MSVC
-
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
-
-#endif  // !COMPILER_MSVC
-#endif  // !ALLOW_THIS_IN_INITIALIZER_LIST
+// CEF uses base types.
+#define SCOPED_PTR(type) scoped_ptr<type>
+#define DEFAULT_DELETER(type) struct base::DefaultDeleter<type>
 
 #if !defined(arraysize)
 
@@ -213,6 +194,41 @@ struct CompileAssert {
 
 #endif  // !defined(COMPILE_ASSERT)
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#if !defined(ALLOW_THIS_IN_INITIALIZER_LIST)
+#if defined(COMPILER_MSVC)
+
+// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
+// The warning remains disabled until popped by MSVC_POP_WARNING.
+#define MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \
+                                     __pragma(warning(disable:n))
+
+// MSVC_PUSH_WARNING_LEVEL pushes |n| as the global warning level.  The level
+// remains in effect until popped by MSVC_POP_WARNING().  Use 0 to disable all
+// warnings.
+#define MSVC_PUSH_WARNING_LEVEL(n) __pragma(warning(push, n))
+
+// Pop effects of innermost MSVC_PUSH_* macro.
+#define MSVC_POP_WARNING() __pragma(warning(pop))
+
+// Allows |this| to be passed as an argument in constructor initializer lists.
+// This uses push/pop instead of the seemingly simpler suppress feature to avoid
+// having the warning be disabled for more than just |code|.
+//
+// Example usage:
+// Foo::Foo() : x(NULL), ALLOW_THIS_IN_INITIALIZER_LIST(y(this)), z(3) {}
+//
+// Compiler warning C4355: 'this': used in base member initializer list:
+// http://msdn.microsoft.com/en-us/library/3c594ae3(VS.80).aspx
+#define ALLOW_THIS_IN_INITIALIZER_LIST(code) MSVC_PUSH_DISABLE_WARNING(4355) \
+                                             code \
+                                             MSVC_POP_WARNING()
+#else  // !COMPILER_MSVC
+
+#define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
+
+#endif  // !COMPILER_MSVC
+#endif  // !ALLOW_THIS_IN_INITIALIZER_LIST
 
 #endif  // CEF_INCLUDE_BASE_CEF_MACROS_H_

include/base/cef_move.h

@@ -36,10 +36,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/move.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -254,6 +254,6 @@
   typedef void MoveOnlyTypeForCPP03; \
  private:
  
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_MOVE_H_

include/base/cef_platform_thread.h

@@ -40,10 +40,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/platform_thread.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -108,6 +108,6 @@ inline PlatformThreadRef CurrentRef() {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_PLATFORM_THREAD_H_

include/base/cef_ref_counted.h

@@ -38,10 +38,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/memory/ref_counted.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -381,6 +381,6 @@ scoped_refptr<T> make_scoped_refptr(T* t) {
   return scoped_refptr<T>(t);
 }
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_

include/base/cef_scoped_ptr.h

@@ -119,10 +119,9 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
-// When building CEF include the Chromium header directly.
-#include "base/memory/scoped_ptr.h"
-#else  // !BUILDING_CEF_SHARED
+#elif defined(USING_CHROMIUM_INCLUDES)
+// Do nothing when building CEF.
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -619,6 +618,6 @@ scoped_ptr<T> make_scoped_ptr(T* ptr) {
   return scoped_ptr<T>(ptr);
 }
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_

include/base/cef_string16.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/strings/string16.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -222,6 +222,6 @@ class std::basic_string<base::char16, base::string16_char_traits>;
 
 #endif  // WCHAR_T_IS_UTF32
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_STRING16_H_

include/base/cef_template_util.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/template_util.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -187,6 +187,6 @@ struct enable_if<true, T> { typedef T type; };
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_

include/base/cef_thread_checker.h

@@ -37,33 +37,32 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/thread_checker.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
+#include "include/base/cef_logging.h"
+#include "include/base/internal/cef_thread_checker_impl.h"
+
 // Apart from debug builds, we also enable the thread checker in
 // builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
 // with this define will get the same level of thread checking as
 // debug bots.
-//
-// Note that this does not perfectly match situations where DCHECK is
-// enabled.  For example a non-official release build may have
-// DCHECK_ALWAYS_ON undefined (and therefore ThreadChecker would be
-// disabled) but have DCHECKs enabled at runtime.
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+#if DCHECK_IS_ON()
 #define ENABLE_THREAD_CHECKER 1
 #else
 #define ENABLE_THREAD_CHECKER 0
 #endif
 
-#include "include/base/internal/cef_thread_checker_impl.h"
 
 namespace base {
 
+namespace cef_internal {
+
 // Do nothing implementation, for use in release mode.
 //
 // Note: You should almost always use the ThreadChecker class to get the
@@ -77,6 +76,8 @@ class ThreadCheckerDoNothing {
   void DetachFromThread() {}
 };
 
+}  // namespace cef_internal
+
 // ThreadChecker is a helper class used to help verify that some methods of a
 // class are called from the same thread. It provides identical functionality to
 // base::NonThreadSafe, but it is meant to be held as a member variable, rather
@@ -109,10 +110,10 @@ class ThreadCheckerDoNothing {
 //
 // In Release mode, CalledOnValidThread will always return true.
 #if ENABLE_THREAD_CHECKER
-class ThreadChecker : public ThreadCheckerImpl {
+class ThreadChecker : public cef_internal::ThreadCheckerImpl {
 };
 #else
-class ThreadChecker : public ThreadCheckerDoNothing {
+class ThreadChecker : public cef_internal::ThreadCheckerDoNothing {
 };
 #endif  // ENABLE_THREAD_CHECKER
 
@@ -120,6 +121,6 @@ class ThreadChecker : public ThreadCheckerDoNothing {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_THREAD_CHECKER_H_

include/base/cef_thread_collision_warner.h

@@ -37,10 +37,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/thread_collision_warner.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -282,6 +282,6 @@ class ThreadCollisionWarner {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_

include/base/cef_trace_event.h

@@ -145,10 +145,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/debug/trace_event.h"
-#else  // !BUILDING_CEF_SHARED
+#include "base/trace_event/trace_event.h"
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -422,6 +422,6 @@ class CefTraceEndOnScopeClose {
 
 }  // cef_trace_event
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_

include/base/cef_tuple.h

@@ -57,84 +57,14 @@
 #pragma once
 
 #if defined(BASE_TUPLE_H_)
-// The Chromium header has already been included.
+// Do nothing if the Chromium header has already been included.
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-
-// For legacy compatibility, we name the first 8 tuple elements "a", "b", ...
-// TODO(cef): Remove this code when cef_runnable.h is deleted.
-
-namespace base {
-
-#define DEFINE_TUPLE_LEAF(N, x)                                        \
-  template <typename T>                                                \
-  struct TupleLeaf<N, T> {                                             \
-    TupleLeaf() {}                                                     \
-    explicit TupleLeaf(typename TupleTraits<T>::ParamType x) : x(x) {} \
-                                                                       \
-    T& get() { return x; }                                             \
-    const T& get() const { return x; }                                 \
-                                                                       \
-    T x;                                                               \
-  }
-
-DEFINE_TUPLE_LEAF(0, a);
-DEFINE_TUPLE_LEAF(1, b);
-DEFINE_TUPLE_LEAF(2, c);
-DEFINE_TUPLE_LEAF(3, d);
-DEFINE_TUPLE_LEAF(4, e);
-DEFINE_TUPLE_LEAF(5, f);
-DEFINE_TUPLE_LEAF(6, g);
-DEFINE_TUPLE_LEAF(7, h);
-
-#undef DEFINE_TUPLE_LEAF
-
-// Deprecated compat aliases
-// TODO(cef): Remove this code when cef_runnable.h is deleted.
-
-using Tuple0 = Tuple<>;
-template <typename A>
-using Tuple1 = Tuple<A>;
-template <typename A, typename B>
-using Tuple2 = Tuple<A, B>;
-template <typename A, typename B, typename C>
-using Tuple3 = Tuple<A, B, C>;
-template <typename A, typename B, typename C, typename D>
-using Tuple4 = Tuple<A, B, C, D>;
-template <typename A, typename B, typename C, typename D, typename E>
-using Tuple5 = Tuple<A, B, C, D, E>;
-template <typename A,
-          typename B,
-          typename C,
-          typename D,
-          typename E,
-          typename F>
-using Tuple6 = Tuple<A, B, C, D, E, F>;
-template <typename A,
-          typename B,
-          typename C,
-          typename D,
-          typename E,
-          typename F,
-          typename G>
-using Tuple7 = Tuple<A, B, C, D, E, F, G>;
-template <typename A,
-          typename B,
-          typename C,
-          typename D,
-          typename E,
-          typename F,
-          typename G,
-          typename H>
-using Tuple8 = Tuple<A, B, C, D, E, F, G, H>;
-
-}  // namespace base
-
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/tuple.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -1402,6 +1332,6 @@ inline void DispatchToMethod(ObjT* obj, Method method,
 
 }  // namespace base
 
-#endif // !BUILDING_CEF_SHARED
+#endif // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_TUPLE_H_

include/base/cef_weak_ptr.h

@@ -42,6 +42,7 @@
 //
 //  class Controller {
 //   public:
+//    Controller() : weak_factory_(this) {}
 //    void SpawnWorker() { Worker::StartNew(weak_factory_.GetWeakPtr()); }
 //    void WorkComplete(const Result& result) { ... }
 //   private:
@@ -83,8 +84,13 @@
 // WeakPtrs can still be handed off to other threads, e.g. to use to post tasks
 // back to object on the bound thread.
 //
-// Invalidating the factory's WeakPtrs un-binds it from the thread, allowing it
-// to be passed for a different thread to use or delete it.
+// If all WeakPtr objects are destroyed or invalidated then the factory is
+// unbound from the SequencedTaskRunner/Thread. The WeakPtrFactory may then be
+// destroyed, or new WeakPtr objects may be used, from a different sequence.
+//
+// Thus, at least one WeakPtr object must exist and have been dereferenced on
+// the correct thread to enforce that other WeakPtr objects will enforce they
+// are used on the desired thread.
 
 #ifndef CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
 #define CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
@@ -95,10 +101,10 @@
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
 // the Chromium header first to avoid type conflicts.
-#elif defined(BUILDING_CEF_SHARED)
+#elif defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/memory/weak_ptr.h"
-#else  // !BUILDING_CEF_SHARED
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -377,6 +383,6 @@ WeakPtr<Derived> AsWeakPtr(Derived* t) {
 
 }  // namespace base
 
-#endif  // !BUILDING_CEF_SHARED
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_

include/base/internal/cef_bind_internal.h

@@ -2554,7 +2554,7 @@ template <typename Runnable, typename RunType, typename BoundArgsType>
 struct BindState;
 
 template <typename Runnable, typename RunType>
-struct BindState<Runnable, RunType, void()> final : public BindStateBase {
+struct BindState<Runnable, RunType, void()> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef false_type IsWeakCall;
   typedef Invoker<0, BindState, RunType> InvokerType;
@@ -2574,7 +2574,7 @@ struct BindState<Runnable, RunType, void()> final : public BindStateBase {
 };
 
 template <typename Runnable, typename RunType, typename P1>
-struct BindState<Runnable, RunType, void(P1)> final : public BindStateBase {
+struct BindState<Runnable, RunType, void(P1)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<1, BindState, RunType> InvokerType;
@@ -2602,7 +2602,7 @@ struct BindState<Runnable, RunType, void(P1)> final : public BindStateBase {
 };
 
 template <typename Runnable, typename RunType, typename P1, typename P2>
-struct BindState<Runnable, RunType, void(P1, P2)> final : public BindStateBase {
+struct BindState<Runnable, RunType, void(P1, P2)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<2, BindState, RunType> InvokerType;
@@ -2634,7 +2634,7 @@ struct BindState<Runnable, RunType, void(P1, P2)> final : public BindStateBase {
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3>
-struct BindState<Runnable, RunType, void(P1, P2, P3)> final
+struct BindState<Runnable, RunType, void(P1, P2, P3)>
     : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
@@ -2670,7 +2670,7 @@ struct BindState<Runnable, RunType, void(P1, P2, P3)> final
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4)> final
+struct BindState<Runnable, RunType, void(P1, P2, P3, P4)>
     : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
@@ -2710,7 +2710,7 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4)> final
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4, typename P5>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)> final
+struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)>
     : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
@@ -2753,7 +2753,7 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)> final
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4, typename P5, typename P6>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)> final
+struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)>
     : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
@@ -2799,7 +2799,7 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)> final
 
 template <typename Runnable, typename RunType, typename P1, typename P2,
     typename P3, typename P4, typename P5, typename P6, typename P7>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6, P7)> final
+struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6, P7)>
     : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;

include/base/internal/cef_callback_internal.h

@@ -60,7 +60,7 @@ class BindStateBase {
  protected:
   explicit BindStateBase(void (*destructor)(BindStateBase*))
       : ref_count_(0), destructor_(destructor) {}
-  ~BindStateBase() = default;
+  ~BindStateBase() {}
 
  private:
   friend class scoped_refptr<BindStateBase>;

include/base/internal/cef_thread_checker_impl.h

@@ -37,6 +37,7 @@
 #include "include/base/cef_platform_thread.h"
 
 namespace base {
+namespace cef_internal {
 
 // Real implementation of ThreadChecker, for use in debug mode, or
 // for temporary use in release mode (e.g. to CHECK on a threading issue
@@ -65,6 +66,7 @@ class ThreadCheckerImpl {
   mutable PlatformThreadRef valid_thread_id_;
 };
 
+}  // namespace cef_internal
 }  // namespace base
 
 #endif  // CEF_INCLUDE_BASE_INTERNAL_THREAD_CHECKER_IMPL_H_

include/capi/cef_app_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -144,11 +144,18 @@ CEF_EXPORT void cef_shutdown();
 
 ///
 // Perform a single iteration of CEF message loop processing. This function is
-// used to integrate the CEF message loop into an existing application message
-// loop. Care must be taken to balance performance against excessive CPU usage.
-// This function should only be called on the main application thread and only
-// if cef_initialize() is called with a CefSettings.multi_threaded_message_loop
-// value of false (0). This function will not block.
+// provided for cases where the CEF message loop must be integrated into an
+// existing application message loop. Use of this function is not recommended
+// for most users; use either the cef_run_message_loop() function or
+// CefSettings.multi_threaded_message_loop if possible. When using this function
+// care must be taken to balance performance against excessive CPU usage. It is
+// recommended to enable the CefSettings.external_message_pump option when using
+// this function so that
+// cef_browser_process_handler_t::on_schedule_message_pump_work() callbacks can
+// facilitate the scheduling process. This function should only be called on the
+// main application thread and only if cef_initialize() is called with a
+// CefSettings.multi_threaded_message_loop value of false (0). This function
+// will not block.
 ///
 CEF_EXPORT void cef_do_message_loop_work();
 
@@ -175,6 +182,13 @@ CEF_EXPORT void cef_quit_message_loop();
 ///
 CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);
 
+///
+// Call during process startup to enable High-DPI support on Windows 7 or newer.
+// Older versions of Windows should be left DPI-unaware because they do not
+// support DirectWrite and GDI fonts are kerned very badly.
+///
+CEF_EXPORT void cef_enable_highdpi_support();
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_auth_callback_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_browser_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -41,6 +41,7 @@
 #include "include/capi/cef_base_capi.h"
 #include "include/capi/cef_drag_data_capi.h"
 #include "include/capi/cef_frame_capi.h"
+#include "include/capi/cef_image_capi.h"
 #include "include/capi/cef_navigation_entry_capi.h"
 #include "include/capi/cef_process_message_capi.h"
 #include "include/capi/cef_request_context_capi.h"
@@ -174,7 +175,7 @@ typedef struct _cef_browser_t {
   void (CEF_CALLBACK *get_frame_names)(struct _cef_browser_t* self,
       cef_string_list_t names);
 
-  //
+  ///
   // Send a message to the specified |target_process|. Returns true (1) if the
   // message was sent successfully.
   ///
@@ -251,6 +252,29 @@ typedef struct _cef_pdf_print_callback_t {
 } cef_pdf_print_callback_t;
 
 
+///
+// Callback structure for cef_browser_host_t::DownloadImage. The functions of
+// this structure will be called on the browser process UI thread.
+///
+typedef struct _cef_download_image_callback_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Method that will be executed when the image download has completed.
+  // |image_url| is the URL that was downloaded and |http_status_code| is the
+  // resulting HTTP status code. |image| is the resulting image, possibly at
+  // multiple scale factors, or NULL if the download failed.
+  ///
+  void (CEF_CALLBACK *on_download_image_finished)(
+      struct _cef_download_image_callback_t* self,
+      const cef_string_t* image_url, int http_status_code,
+      struct _cef_image_t* image);
+} cef_download_image_callback_t;
+
+
 ///
 // Structure used to represent the browser process aspects of a browser window.
 // The functions of this structure can only be called in the browser process.
@@ -282,32 +306,43 @@ typedef struct _cef_browser_host_t {
   void (CEF_CALLBACK *close_browser)(struct _cef_browser_host_t* self,
       int force_close);
 
+  ///
+  // Helper for closing a browser. Call this function from the top-level window
+  // close handler. Internally this calls CloseBrowser(false (0)) if the close
+  // has not yet been initiated. This function returns false (0) while the close
+  // is pending and true (1) after the close has completed. See close_browser()
+  // and cef_life_span_handler_t::do_close() documentation for additional usage
+  // information. This function must be called on the browser process UI thread.
+  ///
+  int (CEF_CALLBACK *try_close_browser)(struct _cef_browser_host_t* self);
+
   ///
   // Set whether the browser is focused.
   ///
   void (CEF_CALLBACK *set_focus)(struct _cef_browser_host_t* self, int focus);
 
   ///
-  // Set whether the window containing the browser is visible
-  // (minimized/unminimized, app hidden/unhidden, etc). Only used on Mac OS X.
-  ///
-  void (CEF_CALLBACK *set_window_visibility)(struct _cef_browser_host_t* self,
-      int visible);
-
-  ///
-  // Retrieve the window handle for this browser.
+  // Retrieve the window handle for this browser. If this browser is wrapped in
+  // a cef_browser_view_t this function should be called on the browser process
+  // UI thread and it will return the handle for the top-level native window.
   ///
   cef_window_handle_t (CEF_CALLBACK *get_window_handle)(
       struct _cef_browser_host_t* self);
 
   ///
   // Retrieve the window handle of the browser that opened this browser. Will
-  // return NULL for non-popup windows. This function can be used in combination
-  // with custom handling of modal windows.
+  // return NULL for non-popup windows or if this browser is wrapped in a
+  // cef_browser_view_t. This function can be used in combination with custom
+  // handling of modal windows.
   ///
   cef_window_handle_t (CEF_CALLBACK *get_opener_window_handle)(
       struct _cef_browser_host_t* self);
 
+  ///
+  // Returns true (1) if this browser is wrapped in a cef_browser_view_t.
+  ///
+  int (CEF_CALLBACK *has_view)(struct _cef_browser_host_t* self);
+
   ///
   // Returns the client for this browser.
   ///
@@ -362,6 +397,22 @@ typedef struct _cef_browser_host_t {
   void (CEF_CALLBACK *start_download)(struct _cef_browser_host_t* self,
       const cef_string_t* url);
 
+  ///
+  // Download |image_url| and execute |callback| on completion with the images
+  // received from the renderer. If |is_favicon| is true (1) then cookies are
+  // not sent and not accepted during download. Images with density independent
+  // pixel (DIP) sizes larger than |max_image_size| are filtered out from the
+  // image results. Versions of the image at different scale factors may be
+  // downloaded up to the maximum scale factor supported by the system. If there
+  // are no image results <= |max_image_size| then the smallest image is resized
+  // to |max_image_size| and is the only result. A |max_image_size| of 0 means
+  // unlimited. If |bypass_cache| is true (1) then |image_url| is requested from
+  // the server even if it is present in the browser cache.
+  ///
+  void (CEF_CALLBACK *download_image)(struct _cef_browser_host_t* self,
+      const cef_string_t* image_url, int is_favicon, uint32 max_image_size,
+      int bypass_cache, struct _cef_download_image_callback_t* callback);
+
   ///
   // Print the current browser contents.
   ///
@@ -397,8 +448,13 @@ typedef struct _cef_browser_host_t {
       int clearSelection);
 
   ///
-  // Open developer tools in its own window. If |inspect_element_at| is non-
-  // NULL the element at the specified (x,y) location will be inspected.
+  // Open developer tools (DevTools) in its own browser. The DevTools browser
+  // will remain associated with this browser. If the DevTools browser is
+  // already open then it will be focused, in which case the |windowInfo|,
+  // |client| and |settings| parameters will be ignored. If |inspect_element_at|
+  // is non-NULL then the element at the specified (x,y) location will be
+  // inspected. The |windowInfo| parameter will be ignored if this browser is
+  // wrapped in a cef_browser_view_t.
   ///
   void (CEF_CALLBACK *show_dev_tools)(struct _cef_browser_host_t* self,
       const struct _cef_window_info_t* windowInfo,
@@ -407,18 +463,22 @@ typedef struct _cef_browser_host_t {
       const cef_point_t* inspect_element_at);
 
   ///
-  // Explicitly close the developer tools window if one exists for this browser
-  // instance.
+  // Explicitly close the associated DevTools browser, if any.
   ///
   void (CEF_CALLBACK *close_dev_tools)(struct _cef_browser_host_t* self);
 
+  ///
+  // Returns true (1) if this browser currently has an associated DevTools
+  // browser. Must be called on the browser process UI thread.
+  ///
+  int (CEF_CALLBACK *has_dev_tools)(struct _cef_browser_host_t* self);
+
   ///
   // Retrieve a snapshot of current navigation entries as values sent to the
   // specified visitor. If |current_only| is true (1) only the current
   // navigation entry will be sent, otherwise all navigation entries will be
   // sent.
   ///
-  ///
   void (CEF_CALLBACK *get_navigation_entries)(struct _cef_browser_host_t* self,
       struct _cef_navigation_entry_visitor_t* visitor, int current_only);
 

include/capi/cef_browser_process_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -94,6 +94,22 @@ typedef struct _cef_browser_process_handler_t {
   ///
   struct _cef_print_handler_t* (CEF_CALLBACK *get_print_handler)(
       struct _cef_browser_process_handler_t* self);
+
+  ///
+  // Called from any thread when work has been scheduled for the browser process
+  // main (UI) thread. This callback is used in combination with CefSettings.
+  // external_message_pump and cef_do_message_loop_work() in cases where the CEF
+  // message loop must be integrated into an existing application message loop
+  // (see additional comments and warnings on CefDoMessageLoopWork). This
+  // callback should schedule a cef_do_message_loop_work() call to happen on the
+  // main (UI) thread. |delay_ms| is the requested delay in milliseconds. If
+  // |delay_ms| is <= 0 then the call should happen reasonably soon. If
+  // |delay_ms| is > 0 then the call should be scheduled to happen after the
+  // specified delay and any currently pending scheduled call should be
+  // cancelled.
+  ///
+  void (CEF_CALLBACK *on_schedule_message_pump_work)(
+      struct _cef_browser_process_handler_t* self, int64 delay_ms);
 } cef_browser_process_handler_t;
 
 

include/capi/cef_callback_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_client_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_command_line_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_context_menu_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -49,6 +49,29 @@ extern "C" {
 
 struct _cef_context_menu_params_t;
 
+///
+// Callback structure used for continuation of custom context menu display.
+///
+typedef struct _cef_run_context_menu_callback_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Complete context menu display by selecting the specified |command_id| and
+  // |event_flags|.
+  ///
+  void (CEF_CALLBACK *cont)(struct _cef_run_context_menu_callback_t* self,
+      int command_id, cef_event_flags_t event_flags);
+
+  ///
+  // Cancel context menu display.
+  ///
+  void (CEF_CALLBACK *cancel)(struct _cef_run_context_menu_callback_t* self);
+} cef_run_context_menu_callback_t;
+
+
 ///
 // Implement this structure to handle context menu events. The functions of this
 // structure will be called on the UI thread.
@@ -71,6 +94,20 @@ typedef struct _cef_context_menu_handler_t {
       struct _cef_frame_t* frame, struct _cef_context_menu_params_t* params,
       struct _cef_menu_model_t* model);
 
+  ///
+  // Called to allow custom display of the context menu. |params| provides
+  // information about the context menu state. |model| contains the context menu
+  // model resulting from OnBeforeContextMenu. For custom display return true
+  // (1) and execute |callback| either synchronously or asynchronously with the
+  // selected command ID. For default display return false (0). Do not keep
+  // references to |params| or |model| outside of this callback.
+  ///
+  int (CEF_CALLBACK *run_context_menu)(struct _cef_context_menu_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      struct _cef_context_menu_params_t* params,
+      struct _cef_menu_model_t* model,
+      struct _cef_run_context_menu_callback_t* callback);
+
   ///
   // Called to execute a command selected from the context menu. Return true (1)
   // if the command was handled or false (0) for the default implementation. See
@@ -232,6 +269,18 @@ typedef struct _cef_context_menu_params_t {
   ///
   cef_context_menu_edit_state_flags_t (CEF_CALLBACK *get_edit_state_flags)(
       struct _cef_context_menu_params_t* self);
+
+  ///
+  // Returns true (1) if the context menu contains items specified by the
+  // renderer process (for example, plugin placeholder or pepper plugin menu
+  // items).
+  ///
+  int (CEF_CALLBACK *is_custom_menu)(struct _cef_context_menu_params_t* self);
+
+  ///
+  // Returns true (1) if the context menu was invoked from a pepper plugin.
+  ///
+  int (CEF_CALLBACK *is_pepper_menu)(struct _cef_context_menu_params_t* self);
 } cef_context_menu_params_t;
 
 

include/capi/cef_cookie_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,10 +60,10 @@ typedef struct _cef_cookie_manager_t {
   cef_base_t base;
 
   ///
-  // Set the schemes supported by this manager. By default only "http" and
-  // "https" schemes are supported. If |callback| is non-NULL it will be
-  // executed asnychronously on the IO thread after the change has been applied.
-  // Must be called before any cookies are accessed.
+  // Set the schemes supported by this manager. The default schemes ("http",
+  // "https", "ws" and "wss") will always be supported. If |callback| is non-
+  // NULL it will be executed asnychronously on the IO thread after the change
+  // has been applied. Must be called before any cookies are accessed.
   ///
   void (CEF_CALLBACK *set_supported_schemes)(struct _cef_cookie_manager_t* self,
       cef_string_list_t schemes, struct _cef_completion_callback_t* callback);

include/capi/cef_dialog_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_display_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_dom_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_download_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_download_item_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_drag_data_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_drag_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_find_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_focus_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_frame_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -176,7 +176,8 @@ typedef struct _cef_frame_t {
   cef_string_userfree_t (CEF_CALLBACK *get_name)(struct _cef_frame_t* self);
 
   ///
-  // Returns the globally unique identifier for this frame.
+  // Returns the globally unique identifier for this frame or < 0 if the
+  // underlying frame does not yet exist.
   ///
   int64 (CEF_CALLBACK *get_identifier)(struct _cef_frame_t* self);
 

include/capi/cef_geolocation_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_geolocation_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -89,13 +89,12 @@ typedef struct _cef_geolocation_handler_t {
       struct _cef_geolocation_callback_t* callback);
 
   ///
-  // Called when a geolocation access request is canceled. |requesting_url| is
-  // the URL that originally requested permission and |request_id| is the unique
-  // ID for the permission request.
+  // Called when a geolocation access request is canceled. |request_id| is the
+  // unique ID for the permission request.
   ///
   void (CEF_CALLBACK *on_cancel_geolocation_permission)(
       struct _cef_geolocation_handler_t* self, struct _cef_browser_t* browser,
-      const cef_string_t* requesting_url, int request_id);
+      int request_id);
 } cef_geolocation_handler_t;
 
 

include/capi/cef_image_capi.h

@@ -0,0 +1,187 @@
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+
+#ifndef CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
+#pragma once
+
+#include "include/capi/cef_base_capi.h"
+#include "include/capi/cef_values_capi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+///
+// Container for a single image represented at different scale factors. All
+// image representations should be the same size in density independent pixel
+// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
+// then the image at scale factor 2.0 should be 200x200 pixels -- both images
+// will display with a DIP size of 100x100 units. The functions of this
+// structure must be called on the browser process UI thread.
+///
+typedef struct _cef_image_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Returns true (1) if this Image is NULL.
+  ///
+  int (CEF_CALLBACK *is_empty)(struct _cef_image_t* self);
+
+  ///
+  // Returns true (1) if this Image and |that| Image share the same underlying
+  // storage. Will also return true (1) if both images are NULL.
+  ///
+  int (CEF_CALLBACK *is_same)(struct _cef_image_t* self,
+      struct _cef_image_t* that);
+
+  ///
+  // Add a bitmap image representation for |scale_factor|. Only 32-bit RGBA/BGRA
+  // formats are supported. |pixel_width| and |pixel_height| are the bitmap
+  // representation size in pixel coordinates. |pixel_data| is the array of
+  // pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in size.
+  // |color_type| and |alpha_type| values specify the pixel format.
+  ///
+  int (CEF_CALLBACK *add_bitmap)(struct _cef_image_t* self, float scale_factor,
+      int pixel_width, int pixel_height, cef_color_type_t color_type,
+      cef_alpha_type_t alpha_type, const void* pixel_data,
+      size_t pixel_data_size);
+
+  ///
+  // Add a PNG image representation for |scale_factor|. |png_data| is the image
+  // data of size |png_data_size|. Any alpha transparency in the PNG data will
+  // be maintained.
+  ///
+  int (CEF_CALLBACK *add_png)(struct _cef_image_t* self, float scale_factor,
+      const void* png_data, size_t png_data_size);
+
+  ///
+  // Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
+  // image data of size |jpeg_data_size|. The JPEG format does not support
+  // transparency so the alpha byte will be set to 0xFF for all pixels.
+  ///
+  int (CEF_CALLBACK *add_jpeg)(struct _cef_image_t* self, float scale_factor,
+      const void* jpeg_data, size_t jpeg_data_size);
+
+  ///
+  // Returns the image width in density independent pixel (DIP) units.
+  ///
+  size_t (CEF_CALLBACK *get_width)(struct _cef_image_t* self);
+
+  ///
+  // Returns the image height in density independent pixel (DIP) units.
+  ///
+  size_t (CEF_CALLBACK *get_height)(struct _cef_image_t* self);
+
+  ///
+  // Returns true (1) if this image contains a representation for
+  // |scale_factor|.
+  ///
+  int (CEF_CALLBACK *has_representation)(struct _cef_image_t* self,
+      float scale_factor);
+
+  ///
+  // Removes the representation for |scale_factor|. Returns true (1) on success.
+  ///
+  int (CEF_CALLBACK *remove_representation)(struct _cef_image_t* self,
+      float scale_factor);
+
+  ///
+  // Returns information for the representation that most closely matches
+  // |scale_factor|. |actual_scale_factor| is the actual scale factor for the
+  // representation. |pixel_width| and |pixel_height| are the representation
+  // size in pixel coordinates. Returns true (1) on success.
+  ///
+  int (CEF_CALLBACK *get_representation_info)(struct _cef_image_t* self,
+      float scale_factor, float* actual_scale_factor, int* pixel_width,
+      int* pixel_height);
+
+  ///
+  // Returns the bitmap representation that most closely matches |scale_factor|.
+  // Only 32-bit RGBA/BGRA formats are supported. |color_type| and |alpha_type|
+  // values specify the desired output pixel format. |pixel_width| and
+  // |pixel_height| are the output representation size in pixel coordinates.
+  // Returns a cef_binary_value_t containing the pixel data on success or NULL
+  // on failure.
+  ///
+  struct _cef_binary_value_t* (CEF_CALLBACK *get_as_bitmap)(
+      struct _cef_image_t* self, float scale_factor,
+      cef_color_type_t color_type, cef_alpha_type_t alpha_type,
+      int* pixel_width, int* pixel_height);
+
+  ///
+  // Returns the PNG representation that most closely matches |scale_factor|. If
+  // |with_transparency| is true (1) any alpha transparency in the image will be
+  // represented in the resulting PNG data. |pixel_width| and |pixel_height| are
+  // the output representation size in pixel coordinates. Returns a
+  // cef_binary_value_t containing the PNG image data on success or NULL on
+  // failure.
+  ///
+  struct _cef_binary_value_t* (CEF_CALLBACK *get_as_png)(
+      struct _cef_image_t* self, float scale_factor, int with_transparency,
+      int* pixel_width, int* pixel_height);
+
+  ///
+  // Returns the JPEG representation that most closely matches |scale_factor|.
+  // |quality| determines the compression level with 0 == lowest and 100 ==
+  // highest. The JPEG format does not support alpha transparency and the alpha
+  // channel, if any, will be discarded. |pixel_width| and |pixel_height| are
+  // the output representation size in pixel coordinates. Returns a
+  // cef_binary_value_t containing the JPEG image data on success or NULL on
+  // failure.
+  ///
+  struct _cef_binary_value_t* (CEF_CALLBACK *get_as_jpeg)(
+      struct _cef_image_t* self, float scale_factor, int quality,
+      int* pixel_width, int* pixel_height);
+} cef_image_t;
+
+
+///
+// Create a new cef_image_t. It will initially be NULL. Use the Add*() functions
+// to add representations at different scale factors.
+///
+CEF_EXPORT cef_image_t* cef_image_create();
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_

include/capi/cef_jsdialog_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -76,7 +76,9 @@ typedef struct _cef_jsdialog_handler_t {
   cef_base_t base;
 
   ///
-  // Called to run a JavaScript dialog. The |default_prompt_text| value will be
+  // Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be
+  // passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
+  // and user-friendly display string. The |default_prompt_text| value will be
   // specified for prompt dialogs only. Set |suppress_message| to true (1) and
   // return false (0) to suppress the message (suppressing messages is
   // preferable to immediately executing the callback as this is used to detect
@@ -92,8 +94,7 @@ typedef struct _cef_jsdialog_handler_t {
   ///
   int (CEF_CALLBACK *on_jsdialog)(struct _cef_jsdialog_handler_t* self,
       struct _cef_browser_t* browser, const cef_string_t* origin_url,
-      const cef_string_t* accept_lang, cef_jsdialog_type_t dialog_type,
-      const cef_string_t* message_text,
+      cef_jsdialog_type_t dialog_type, const cef_string_t* message_text,
       const cef_string_t* default_prompt_text,
       struct _cef_jsdialog_callback_t* callback, int* suppress_message);
 

include/capi/cef_keyboard_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -56,11 +56,13 @@ typedef struct _cef_keyboard_handler_t {
   ///
   cef_base_t base;
 
+  ///
   // Called before a keyboard event is sent to the renderer. |event| contains
   // information about the keyboard event. |os_event| is the operating system
   // event message, if any. Return true (1) if the event was handled or false
   // (0) otherwise. If the event will be handled in on_key_event() as a keyboard
   // shortcut set |is_keyboard_shortcut| to true (1) and return false (0).
+  ///
   int (CEF_CALLBACK *on_pre_key_event)(struct _cef_keyboard_handler_t* self,
       struct _cef_browser_t* browser, const struct _cef_key_event_t* event,
       cef_event_handle_t os_event, int* is_keyboard_shortcut);

include/capi/cef_life_span_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -74,7 +74,10 @@ typedef struct _cef_life_span_handler_t {
   // popup browser return true (1). The |client| and |settings| values will
   // default to the source browser's values. If the |no_javascript_access| value
   // is set to false (0) the new browser will not be scriptable and may not be
-  // hosted in the same renderer process as the source browser.
+  // hosted in the same renderer process as the source browser. Any
+  // modifications to |windowInfo| will be ignored if the parent browser is
+  // wrapped in a cef_browser_view_t.
+  ///
   int (CEF_CALLBACK *on_before_popup)(struct _cef_life_span_handler_t* self,
       struct _cef_browser_t* browser, struct _cef_frame_t* frame,
       const cef_string_t* target_url, const cef_string_t* target_frame_name,
@@ -84,56 +87,81 @@ typedef struct _cef_life_span_handler_t {
       struct _cef_browser_settings_t* settings, int* no_javascript_access);
 
   ///
-  // Called after a new browser is created.
+  // Called after a new browser is created. This callback will be the first
+  // notification that references |browser|.
   ///
   void (CEF_CALLBACK *on_after_created)(struct _cef_life_span_handler_t* self,
       struct _cef_browser_t* browser);
 
-  ///
-  // Called when a modal window is about to display and the modal loop should
-  // begin running. Return false (0) to use the default modal loop
-  // implementation or true (1) to use a custom implementation.
-  ///
-  int (CEF_CALLBACK *run_modal)(struct _cef_life_span_handler_t* self,
-      struct _cef_browser_t* browser);
-
   ///
   // Called when a browser has recieved a request to close. This may result
-  // directly from a call to cef_browser_host_t::close_browser() or indirectly
-  // if the browser is a top-level OS window created by CEF and the user
-  // attempts to close the window. This function will be called after the
-  // JavaScript 'onunload' event has been fired. It will not be called for
-  // browsers after the associated OS window has been destroyed (for those
-  // browsers it is no longer possible to cancel the close).
+  // directly from a call to cef_browser_host_t::*close_browser() or indirectly
+  // if the browser is parented to a top-level window created by CEF and the
+  // user attempts to close that window (by clicking the 'X', for example). The
+  // do_close() function will be called after the JavaScript 'onunload' event
+  // has been fired.
   //
-  // If CEF created an OS window for the browser returning false (0) will send
-  // an OS close notification to the browser window's top-level owner (e.g.
-  // WM_CLOSE on Windows, performClose: on OS-X and "delete_event" on Linux). If
-  // no OS window exists (window rendering disabled) returning false (0) will
-  // cause the browser object to be destroyed immediately. Return true (1) if
-  // the browser is parented to another window and that other window needs to
-  // receive close notification via some non-standard technique.
-  //
-  // If an application provides its own top-level window it should handle OS
-  // close notifications by calling cef_browser_host_t::CloseBrowser(false (0))
-  // instead of immediately closing (see the example below). This gives CEF an
+  // An application should handle top-level owner window close notifications by
+  // calling cef_browser_host_t::Tryclose_browser() or
+  // cef_browser_host_t::CloseBrowser(false (0)) instead of allowing the window
+  // to close immediately (see the examples below). This gives CEF an
   // opportunity to process the 'onbeforeunload' event and optionally cancel the
   // close before do_close() is called.
   //
+  // When windowed rendering is enabled CEF will internally create a window or
+  // view to host the browser. In that case returning false (0) from do_close()
+  // will send the standard close notification to the browser's top-level owner
+  // window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
+  // Linux or cef_window_delegate_t::can_close() callback from Views). If the
+  // browser's host window/view has already been destroyed (via view hierarchy
+  // tear-down, for example) then do_close() will not be called for that browser
+  // since is no longer possible to cancel the close.
+  //
+  // When windowed rendering is disabled returning false (0) from do_close()
+  // will cause the browser object to be destroyed immediately.
+  //
+  // If the browser's top-level owner window requires a non-standard close
+  // notification then send that notification from do_close() and return true
+  // (1).
+  //
   // The cef_life_span_handler_t::on_before_close() function will be called
-  // immediately before the browser object is destroyed. The application should
-  // only exit after on_before_close() has been called for all existing
-  // browsers.
+  // after do_close() (if do_close() is called) and immediately before the
+  // browser object is destroyed. The application should only exit after
+  // on_before_close() has been called for all existing browsers.
   //
-  // If the browser represents a modal window and a custom modal loop
-  // implementation was provided in cef_life_span_handler_t::run_modal() this
-  // callback should be used to restore the opener window to a usable state.
+  // The below examples describe what should happen during window close when the
+  // browser is parented to an application-provided top-level window.
   //
-  // By way of example consider what should happen during window close when the
-  // browser is parented to an application-provided top-level OS window. 1.
-  // User clicks the window close button which sends an OS close
-  //     notification (e.g. WM_CLOSE on Windows, performClose: on OS-X and
-  //     "delete_event" on Linux).
+  // Example 1: Using cef_browser_host_t::Tryclose_browser(). This is
+  // recommended for clients using standard close handling and windows created
+  // on the browser process UI thread. 1.  User clicks the window close button
+  // which sends a close notification to
+  //     the application's top-level window.
+  // 2.  Application's top-level window receives the close notification and
+  //     calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
+  //     TryCloseBrowser() returns false so the client cancels the window close.
+  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
+  //     confirmation dialog (which can be overridden via
+  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
+  // 4.  User approves the close. 5.  JavaScript 'onunload' handler executes. 6.
+  // CEF sends a close notification to the application's top-level window
+  //     (because DoClose() returned false by default).
+  // 7.  Application's top-level window receives the close notification and
+  //     calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
+  //     allows the window close.
+  // 8.  Application's top-level window is destroyed. 9.  Application's
+  // on_before_close() handler is called and the browser object
+  //     is destroyed.
+  // 10. Application exits by calling cef_quit_message_loop() if no other
+  // browsers
+  //     exist.
+  //
+  // Example 2: Using cef_browser_host_t::CloseBrowser(false (0)) and
+  // implementing the do_close() callback. This is recommended for clients using
+  // non-standard close handling or windows that were not created on the browser
+  // process UI thread. 1.  User clicks the window close button which sends a
+  // close notification to
+  //     the application's top-level window.
   // 2.  Application's top-level window receives the close notification and:
   //     A. Calls CefBrowserHost::CloseBrowser(false).
   //     B. Cancels the window close.
@@ -144,12 +172,12 @@ typedef struct _cef_life_span_handler_t {
   // Application's do_close() handler is called. Application will:
   //     A. Set a flag to indicate that the next close attempt will be allowed.
   //     B. Return false.
-  // 7.  CEF sends an OS close notification. 8.  Application's top-level window
-  // receives the OS close notification and
+  // 7.  CEF sends an close notification to the application's top-level window.
+  // 8.  Application's top-level window receives the close notification and
   //     allows the window to close based on the flag from #6B.
-  // 9.  Browser OS window is destroyed. 10. Application's
-  // cef_life_span_handler_t::on_before_close() handler is called and
-  //     the browser object is destroyed.
+  // 9.  Application's top-level window is destroyed. 10. Application's
+  // on_before_close() handler is called and the browser object
+  //     is destroyed.
   // 11. Application exits by calling cef_quit_message_loop() if no other
   // browsers
   //     exist.
@@ -160,9 +188,8 @@ typedef struct _cef_life_span_handler_t {
   ///
   // Called just before a browser is destroyed. Release all references to the
   // browser object and do not attempt to execute any functions on the browser
-  // object after this callback returns. If this is a modal window and a custom
-  // modal loop implementation was provided in run_modal() this callback should
-  // be used to exit the custom modal loop. See do_close() documentation for
+  // object after this callback returns. This callback will be the last
+  // notification that references |browser|. See do_close() documentation for
   // additional usage information.
   ///
   void (CEF_CALLBACK *on_before_close)(struct _cef_life_span_handler_t* self,

include/capi/cef_load_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -62,7 +62,8 @@ typedef struct _cef_load_handler_t {
   // Called when the loading state has changed. This callback will be executed
   // twice -- once when loading is initiated either programmatically or by user
   // action, and once when loading is terminated due to completion, cancellation
-  // of failure.
+  // of failure. It will be called before any calls to OnLoadStart and after all
+  // calls to OnLoadError and/or OnLoadEnd.
   ///
   void (CEF_CALLBACK *on_loading_state_change)(struct _cef_load_handler_t* self,
       struct _cef_browser_t* browser, int isLoading, int canGoBack,
@@ -71,14 +72,17 @@ typedef struct _cef_load_handler_t {
   ///
   // Called when the browser begins loading a frame. The |frame| value will
   // never be NULL -- call the is_main() function to check if this frame is the
-  // main frame. Multiple frames may be loading at the same time. Sub-frames may
-  // start or continue loading after the main frame load has ended. This
-  // function may not be called for a particular frame if the load request for
-  // that frame fails. For notification of overall browser load status use
+  // main frame. |transition_type| provides information about the source of the
+  // navigation and an accurate value is only available in the browser process.
+  // Multiple frames may be loading at the same time. Sub-frames may start or
+  // continue loading after the main frame load has ended. This function will
+  // always be called for all frames irrespective of whether the request
+  // completes successfully. For notification of overall browser load status use
   // OnLoadingStateChange instead.
   ///
   void (CEF_CALLBACK *on_load_start)(struct _cef_load_handler_t* self,
-      struct _cef_browser_t* browser, struct _cef_frame_t* frame);
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      cef_transition_type_t transition_type);
 
   ///
   // Called when the browser is done loading a frame. The |frame| value will
@@ -86,7 +90,8 @@ typedef struct _cef_load_handler_t {
   // main frame. Multiple frames may be loading at the same time. Sub-frames may
   // start or continue loading after the main frame load has ended. This
   // function will always be called for all frames irrespective of whether the
-  // request completes successfully.
+  // request completes successfully. For notification of overall browser load
+  // status use OnLoadingStateChange instead.
   ///
   void (CEF_CALLBACK *on_load_end)(struct _cef_load_handler_t* self,
       struct _cef_browser_t* browser, struct _cef_frame_t* frame,

include/capi/cef_menu_model_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -39,6 +39,7 @@
 #pragma once
 
 #include "include/capi/cef_base_capi.h"
+#include "include/capi/cef_menu_model_delegate_capi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,59 +68,59 @@ typedef struct _cef_menu_model_t {
   ///
   int (CEF_CALLBACK *get_count)(struct _cef_menu_model_t* self);
 
-  //
+  ///
   // Add a separator to the menu. Returns true (1) on success.
   ///
   int (CEF_CALLBACK *add_separator)(struct _cef_menu_model_t* self);
 
-  //
+  ///
   // Add an item to the menu. Returns true (1) on success.
   ///
   int (CEF_CALLBACK *add_item)(struct _cef_menu_model_t* self, int command_id,
       const cef_string_t* label);
 
-  //
+  ///
   // Add a check item to the menu. Returns true (1) on success.
   ///
   int (CEF_CALLBACK *add_check_item)(struct _cef_menu_model_t* self,
       int command_id, const cef_string_t* label);
 
-  //
+  ///
   // Add a radio item to the menu. Only a single item with the specified
   // |group_id| can be checked at a time. Returns true (1) on success.
   ///
   int (CEF_CALLBACK *add_radio_item)(struct _cef_menu_model_t* self,
       int command_id, const cef_string_t* label, int group_id);
 
-  //
+  ///
   // Add a sub-menu to the menu. The new sub-menu is returned.
   ///
   struct _cef_menu_model_t* (CEF_CALLBACK *add_sub_menu)(
       struct _cef_menu_model_t* self, int command_id,
       const cef_string_t* label);
 
-  //
+  ///
   // Insert a separator in the menu at the specified |index|. Returns true (1)
   // on success.
   ///
   int (CEF_CALLBACK *insert_separator_at)(struct _cef_menu_model_t* self,
       int index);
 
-  //
+  ///
   // Insert an item in the menu at the specified |index|. Returns true (1) on
   // success.
   ///
   int (CEF_CALLBACK *insert_item_at)(struct _cef_menu_model_t* self, int index,
       int command_id, const cef_string_t* label);
 
-  //
+  ///
   // Insert a check item in the menu at the specified |index|. Returns true (1)
   // on success.
   ///
   int (CEF_CALLBACK *insert_check_item_at)(struct _cef_menu_model_t* self,
       int index, int command_id, const cef_string_t* label);
 
-  //
+  ///
   // Insert a radio item in the menu at the specified |index|. Only a single
   // item with the specified |group_id| can be checked at a time. Returns true
   // (1) on success.
@@ -127,7 +128,7 @@ typedef struct _cef_menu_model_t {
   int (CEF_CALLBACK *insert_radio_item_at)(struct _cef_menu_model_t* self,
       int index, int command_id, const cef_string_t* label, int group_id);
 
-  //
+  ///
   // Insert a sub-menu in the menu at the specified |index|. The new sub-menu is
   // returned.
   ///
@@ -242,98 +243,98 @@ typedef struct _cef_menu_model_t {
   struct _cef_menu_model_t* (CEF_CALLBACK *get_sub_menu_at)(
       struct _cef_menu_model_t* self, int index);
 
-  //
+  ///
   // Returns true (1) if the specified |command_id| is visible.
   ///
   int (CEF_CALLBACK *is_visible)(struct _cef_menu_model_t* self,
       int command_id);
 
-  //
+  ///
   // Returns true (1) if the specified |index| is visible.
   ///
   int (CEF_CALLBACK *is_visible_at)(struct _cef_menu_model_t* self, int index);
 
-  //
+  ///
   // Change the visibility of the specified |command_id|. Returns true (1) on
   // success.
   ///
   int (CEF_CALLBACK *set_visible)(struct _cef_menu_model_t* self,
       int command_id, int visible);
 
-  //
+  ///
   // Change the visibility at the specified |index|. Returns true (1) on
   // success.
   ///
   int (CEF_CALLBACK *set_visible_at)(struct _cef_menu_model_t* self, int index,
       int visible);
 
-  //
+  ///
   // Returns true (1) if the specified |command_id| is enabled.
   ///
   int (CEF_CALLBACK *is_enabled)(struct _cef_menu_model_t* self,
       int command_id);
 
-  //
+  ///
   // Returns true (1) if the specified |index| is enabled.
   ///
   int (CEF_CALLBACK *is_enabled_at)(struct _cef_menu_model_t* self, int index);
 
-  //
+  ///
   // Change the enabled status of the specified |command_id|. Returns true (1)
   // on success.
   ///
   int (CEF_CALLBACK *set_enabled)(struct _cef_menu_model_t* self,
       int command_id, int enabled);
 
-  //
+  ///
   // Change the enabled status at the specified |index|. Returns true (1) on
   // success.
   ///
   int (CEF_CALLBACK *set_enabled_at)(struct _cef_menu_model_t* self, int index,
       int enabled);
 
-  //
+  ///
   // Returns true (1) if the specified |command_id| is checked. Only applies to
   // check and radio items.
   ///
   int (CEF_CALLBACK *is_checked)(struct _cef_menu_model_t* self,
       int command_id);
 
-  //
+  ///
   // Returns true (1) if the specified |index| is checked. Only applies to check
   // and radio items.
   ///
   int (CEF_CALLBACK *is_checked_at)(struct _cef_menu_model_t* self, int index);
 
-  //
+  ///
   // Check the specified |command_id|. Only applies to check and radio items.
   // Returns true (1) on success.
   ///
   int (CEF_CALLBACK *set_checked)(struct _cef_menu_model_t* self,
       int command_id, int checked);
 
-  //
+  ///
   // Check the specified |index|. Only applies to check and radio items. Returns
   // true (1) on success.
   ///
   int (CEF_CALLBACK *set_checked_at)(struct _cef_menu_model_t* self, int index,
       int checked);
 
-  //
+  ///
   // Returns true (1) if the specified |command_id| has a keyboard accelerator
   // assigned.
   ///
   int (CEF_CALLBACK *has_accelerator)(struct _cef_menu_model_t* self,
       int command_id);
 
-  //
+  ///
   // Returns true (1) if the specified |index| has a keyboard accelerator
   // assigned.
   ///
   int (CEF_CALLBACK *has_accelerator_at)(struct _cef_menu_model_t* self,
       int index);
 
-  //
+  ///
   // Set the keyboard accelerator for the specified |command_id|. |key_code| can
   // be any virtual key or character value. Returns true (1) on success.
   ///
@@ -341,7 +342,7 @@ typedef struct _cef_menu_model_t {
       int command_id, int key_code, int shift_pressed, int ctrl_pressed,
       int alt_pressed);
 
-  //
+  ///
   // Set the keyboard accelerator at the specified |index|. |key_code| can be
   // any virtual key or character value. Returns true (1) on success.
   ///
@@ -349,21 +350,21 @@ typedef struct _cef_menu_model_t {
       int index, int key_code, int shift_pressed, int ctrl_pressed,
       int alt_pressed);
 
-  //
+  ///
   // Remove the keyboard accelerator for the specified |command_id|. Returns
   // true (1) on success.
   ///
   int (CEF_CALLBACK *remove_accelerator)(struct _cef_menu_model_t* self,
       int command_id);
 
-  //
+  ///
   // Remove the keyboard accelerator at the specified |index|. Returns true (1)
   // on success.
   ///
   int (CEF_CALLBACK *remove_accelerator_at)(struct _cef_menu_model_t* self,
       int index);
 
-  //
+  ///
   // Retrieves the keyboard accelerator for the specified |command_id|. Returns
   // true (1) on success.
   ///
@@ -371,7 +372,7 @@ typedef struct _cef_menu_model_t {
       int command_id, int* key_code, int* shift_pressed, int* ctrl_pressed,
       int* alt_pressed);
 
-  //
+  ///
   // Retrieves the keyboard accelerator for the specified |index|. Returns true
   // (1) on success.
   ///
@@ -381,6 +382,13 @@ typedef struct _cef_menu_model_t {
 } cef_menu_model_t;
 
 
+///
+// Create a new MenuModel with the specified |delegate|.
+///
+CEF_EXPORT cef_menu_model_t* cef_menu_model_create(
+    struct _cef_menu_model_delegate_t* delegate);
+
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_menu_model_delegate_capi.h

@@ -0,0 +1,80 @@
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+
+#ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
+#pragma once
+
+#include "include/capi/cef_base_capi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _cef_menu_model_t;
+
+///
+// Implement this structure to handle menu model events. The functions of this
+// structure will be called on the browser process UI thread unless otherwise
+// indicated.
+///
+typedef struct _cef_menu_model_delegate_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Perform the action associated with the specified |command_id| and optional
+  // |event_flags|.
+  ///
+  void (CEF_CALLBACK *execute_command)(struct _cef_menu_model_delegate_t* self,
+      struct _cef_menu_model_t* menu_model, int command_id,
+      cef_event_flags_t event_flags);
+
+  ///
+  // The menu is about to show.
+  ///
+  void (CEF_CALLBACK *menu_will_show)(struct _cef_menu_model_delegate_t* self,
+      struct _cef_menu_model_t* menu_model);
+} cef_menu_model_delegate_t;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_

include/capi/cef_navigation_entry_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_origin_whitelist_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_parser_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,6 +60,20 @@ CEF_EXPORT int cef_parse_url(const cef_string_t* url,
 CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts,
     cef_string_t* url);
 
+///
+// This is a convenience function for formatting a URL in a concise and human-
+// friendly way to help users make security-related decisions (or in other
+// circumstances when people need to distinguish sites, origins, or otherwise-
+// simplified URLs from each other). Internationalized domain names (IDN) may be
+// presented in Unicode if the conversion is considered safe. The returned value
+// will (a) omit the path for standard schemes, excepting file and filesystem,
+// and (b) omit the port if it is the default for the scheme. Do not use this
+// for URLs which will be parsed or sent to other applications.
+///
+// The resulting string must be freed by calling cef_string_userfree_free().
+CEF_EXPORT cef_string_userfree_t cef_format_url_for_security_display(
+    const cef_string_t* origin_url);
+
 ///
 // Returns the mime type for the specified file extension or an NULL string if
 // unknown.
@@ -68,10 +82,12 @@ CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts,
 CEF_EXPORT cef_string_userfree_t cef_get_mime_type(
     const cef_string_t* extension);
 
+///
 // Get the extensions associated with the given mime type. This should be passed
 // in lower case. There could be multiple extensions for a given mime type, like
 // "html,htm" for "text/html", or "txt,text,html,..." for "text/*". Any existing
 // elements in the provided vector will not be erased.
+///
 CEF_EXPORT void cef_get_extensions_for_mime_type(const cef_string_t* mime_type,
     cef_string_list_t extensions);
 
@@ -114,30 +130,27 @@ CEF_EXPORT cef_string_userfree_t cef_uridecode(const cef_string_t* text,
     int convert_to_utf8, cef_uri_unescape_rule_t unescape_rule);
 
 ///
-// Parses |string| which represents a CSS color value. If |strict| is true (1)
-// strict parsing rules will be applied. Returns true (1) on success or false
-// (0) on error. If parsing succeeds |color| will be set to the color value
-// otherwise |color| will remain unchanged.
-///
-CEF_EXPORT int cef_parse_csscolor(const cef_string_t* string, int strict,
-    cef_color_t* color);
-
 // Parses the specified |json_string| and returns a dictionary or list
 // representation. If JSON parsing fails this function returns NULL.
+///
 CEF_EXPORT struct _cef_value_t* cef_parse_json(const cef_string_t* json_string,
     cef_json_parser_options_t options);
 
+///
 // Parses the specified |json_string| and returns a dictionary or list
 // representation. If JSON parsing fails this function returns NULL and
 // populates |error_code_out| and |error_msg_out| with an error code and a
 // formatted error message respectively.
+///
 CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
     const cef_string_t* json_string, cef_json_parser_options_t options,
     cef_json_parser_error_t* error_code_out, cef_string_t* error_msg_out);
 
+///
 // Generates a JSON string from the specified root |node| which should be a
 // dictionary or list value. Returns an NULL string on failure. This function
 // requires exclusive access to |node| including any underlying data.
+///
 // The resulting string must be freed by calling cef_string_userfree_free().
 CEF_EXPORT cef_string_userfree_t cef_write_json(struct _cef_value_t* node,
     cef_json_writer_options_t options);

include/capi/cef_path_util_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_print_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -95,6 +95,15 @@ typedef struct _cef_print_handler_t {
   ///
   cef_base_t base;
 
+  ///
+  // Called when printing has started for the specified |browser|. This function
+  // will be called before the other OnPrint*() functions and irrespective of
+  // how printing was initiated (e.g. cef_browser_host_t::print(), JavaScript
+  // window.print() or PDF extension print button).
+  ///
+  void (CEF_CALLBACK *on_print_start)(struct _cef_print_handler_t* self,
+      struct _cef_browser_t* browser);
+
   ///
   // Synchronize |settings| with client state. If |get_defaults| is true (1)
   // then populate |settings| with the default print settings. Do not keep a

include/capi/cef_print_settings_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -121,7 +121,7 @@ typedef struct _cef_print_settings_t {
   // Set the page ranges.
   ///
   void (CEF_CALLBACK *set_page_ranges)(struct _cef_print_settings_t* self,
-      size_t rangesCount, cef_page_range_t const* ranges);
+      size_t rangesCount, cef_range_t const* ranges);
 
   ///
   // Returns the number of page ranges that currently exist.
@@ -133,7 +133,7 @@ typedef struct _cef_print_settings_t {
   // Retrieve the page ranges.
   ///
   void (CEF_CALLBACK *get_page_ranges)(struct _cef_print_settings_t* self,
-      size_t* rangesCount, cef_page_range_t* ranges);
+      size_t* rangesCount, cef_range_t* ranges);
 
   ///
   // Set whether only the selection will be printed.

include/capi/cef_process_message_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_process_util_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_render_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_render_process_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_request_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -87,6 +87,27 @@ typedef struct _cef_request_t {
   void (CEF_CALLBACK *set_method)(struct _cef_request_t* self,
       const cef_string_t* method);
 
+  ///
+  // Set the referrer URL and policy. If non-NULL the referrer URL must be fully
+  // qualified with an HTTP or HTTPS scheme component. Any username, password or
+  // ref component will be removed.
+  ///
+  void (CEF_CALLBACK *set_referrer)(struct _cef_request_t* self,
+      const cef_string_t* referrer_url, cef_referrer_policy_t policy);
+
+  ///
+  // Get the referrer URL.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_referrer_url)(
+      struct _cef_request_t* self);
+
+  ///
+  // Get the referrer policy.
+  ///
+  cef_referrer_policy_t (CEF_CALLBACK *get_referrer_policy)(
+      struct _cef_request_t* self);
+
   ///
   // Get the post data.
   ///
@@ -100,13 +121,14 @@ typedef struct _cef_request_t {
       struct _cef_post_data_t* postData);
 
   ///
-  // Get the header values.
+  // Get the header values. Will not include the Referer value if any.
   ///
   void (CEF_CALLBACK *get_header_map)(struct _cef_request_t* self,
       cef_string_multimap_t headerMap);
 
   ///
-  // Set the header values.
+  // Set the header values. If a Referer value exists in the header map it will
+  // be removed and ignored.
   ///
   void (CEF_CALLBACK *set_header_map)(struct _cef_request_t* self,
       cef_string_multimap_t headerMap);
@@ -190,6 +212,14 @@ typedef struct _cef_post_data_t {
   ///
   int (CEF_CALLBACK *is_read_only)(struct _cef_post_data_t* self);
 
+  ///
+  // Returns true (1) if the underlying POST data includes elements that are not
+  // represented by this cef_post_data_t object (for example, multi-part file
+  // upload data). Modifying cef_post_data_t objects with excluded elements may
+  // result in the request failing.
+  ///
+  int (CEF_CALLBACK *has_excluded_elements)(struct _cef_post_data_t* self);
+
   ///
   // Returns the number of existing post data elements.
   ///

include/capi/cef_request_context_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -38,8 +38,10 @@
 #define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
 #pragma once
 
+#include "include/capi/cef_callback_capi.h"
 #include "include/capi/cef_cookie_capi.h"
 #include "include/capi/cef_request_context_handler_capi.h"
+#include "include/capi/cef_values_capi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,6 +49,26 @@ extern "C" {
 
 struct _cef_scheme_handler_factory_t;
 
+///
+// Callback structure for cef_request_tContext::ResolveHost.
+///
+typedef struct _cef_resolve_callback_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Called after the ResolveHost request has completed. |result| will be the
+  // result code. |resolved_ips| will be the list of resolved IP addresses or
+  // NULL if the resolution failed.
+  ///
+  void (CEF_CALLBACK *on_resolve_completed)(
+      struct _cef_resolve_callback_t* self, cef_errorcode_t result,
+      cef_string_list_t resolved_ips);
+} cef_resolve_callback_t;
+
+
 ///
 // A request context provides request handling for a set of related browser or
 // URL request objects. A request context can be specified when creating a new
@@ -140,6 +162,103 @@ typedef struct _cef_request_context_t {
   ///
   int (CEF_CALLBACK *clear_scheme_handler_factories)(
       struct _cef_request_context_t* self);
+
+  ///
+  // Tells all renderer processes associated with this context to throw away
+  // their plugin list cache. If |reload_pages| is true (1) they will also
+  // reload all pages with plugins.
+  // cef_request_tContextHandler::OnBeforePluginLoad may be called to rebuild
+  // the plugin list cache.
+  ///
+  void (CEF_CALLBACK *purge_plugin_list_cache)(
+      struct _cef_request_context_t* self, int reload_pages);
+
+  ///
+  // Returns true (1) if a preference with the specified |name| exists. This
+  // function must be called on the browser process UI thread.
+  ///
+  int (CEF_CALLBACK *has_preference)(struct _cef_request_context_t* self,
+      const cef_string_t* name);
+
+  ///
+  // Returns the value for the preference with the specified |name|. Returns
+  // NULL if the preference does not exist. The returned object contains a copy
+  // of the underlying preference value and modifications to the returned object
+  // will not modify the underlying preference value. This function must be
+  // called on the browser process UI thread.
+  ///
+  struct _cef_value_t* (CEF_CALLBACK *get_preference)(
+      struct _cef_request_context_t* self, const cef_string_t* name);
+
+  ///
+  // Returns all preferences as a dictionary. If |include_defaults| is true (1)
+  // then preferences currently at their default value will be included. The
+  // returned object contains a copy of the underlying preference values and
+  // modifications to the returned object will not modify the underlying
+  // preference values. This function must be called on the browser process UI
+  // thread.
+  ///
+  struct _cef_dictionary_value_t* (CEF_CALLBACK *get_all_preferences)(
+      struct _cef_request_context_t* self, int include_defaults);
+
+  ///
+  // Returns true (1) if the preference with the specified |name| can be
+  // modified using SetPreference. As one example preferences set via the
+  // command-line usually cannot be modified. This function must be called on
+  // the browser process UI thread.
+  ///
+  int (CEF_CALLBACK *can_set_preference)(struct _cef_request_context_t* self,
+      const cef_string_t* name);
+
+  ///
+  // Set the |value| associated with preference |name|. Returns true (1) if the
+  // value is set successfully and false (0) otherwise. If |value| is NULL the
+  // preference will be restored to its default value. If setting the preference
+  // fails then |error| will be populated with a detailed description of the
+  // problem. This function must be called on the browser process UI thread.
+  ///
+  int (CEF_CALLBACK *set_preference)(struct _cef_request_context_t* self,
+      const cef_string_t* name, struct _cef_value_t* value,
+      cef_string_t* error);
+
+  ///
+  // Clears all certificate exceptions that were added as part of handling
+  // cef_request_tHandler::on_certificate_error(). If you call this it is
+  // recommended that you also call close_all_connections() or you risk not
+  // being prompted again for server certificates if you reconnect quickly. If
+  // |callback| is non-NULL it will be executed on the UI thread after
+  // completion.
+  ///
+  void (CEF_CALLBACK *clear_certificate_exceptions)(
+      struct _cef_request_context_t* self,
+      struct _cef_completion_callback_t* callback);
+
+  ///
+  // Clears all active and idle connections that Chromium currently has. This is
+  // only recommended if you have released all other CEF objects but don't yet
+  // want to call cef_shutdown(). If |callback| is non-NULL it will be executed
+  // on the UI thread after completion.
+  ///
+  void (CEF_CALLBACK *close_all_connections)(
+      struct _cef_request_context_t* self,
+      struct _cef_completion_callback_t* callback);
+
+  ///
+  // Attempts to resolve |origin| to a list of associated IP addresses.
+  // |callback| will be executed on the UI thread after completion.
+  ///
+  void (CEF_CALLBACK *resolve_host)(struct _cef_request_context_t* self,
+      const cef_string_t* origin, struct _cef_resolve_callback_t* callback);
+
+  ///
+  // Attempts to resolve |origin| to a list of associated IP addresses using
+  // cached data. |resolved_ips| will be populated with the list of resolved IP
+  // addresses or NULL if no cached data is available. Returns ERR_NONE on
+  // success. This function must be called on the browser process IO thread.
+  ///
+  cef_errorcode_t (CEF_CALLBACK *resolve_host_cached)(
+      struct _cef_request_context_t* self, const cef_string_t* origin,
+      cef_string_list_t resolved_ips);
 } cef_request_context_t;
 
 
@@ -160,7 +279,7 @@ CEF_EXPORT cef_request_context_t* cef_request_context_create_context(
 // Creates a new context object that shares storage with |other| and uses an
 // optional |handler|.
 ///
-CEF_EXPORT cef_request_context_t* create_context_shared(
+CEF_EXPORT cef_request_context_t* cef_create_context_shared(
     cef_request_context_t* other,
     struct _cef_request_context_handler_t* handler);
 

include/capi/cef_request_context_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -40,6 +40,7 @@
 
 #include "include/capi/cef_base_capi.h"
 #include "include/capi/cef_cookie_capi.h"
+#include "include/capi/cef_web_plugin_capi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,12 +59,36 @@ typedef struct _cef_request_context_handler_t {
   cef_base_t base;
 
   ///
-  // Called on the IO thread to retrieve the cookie manager. If this function
-  // returns NULL the default cookie manager retrievable via
+  // Called on the browser process IO thread to retrieve the cookie manager. If
+  // this function returns NULL the default cookie manager retrievable via
   // cef_request_tContext::get_default_cookie_manager() will be used.
   ///
   struct _cef_cookie_manager_t* (CEF_CALLBACK *get_cookie_manager)(
       struct _cef_request_context_handler_t* self);
+
+  ///
+  // Called on multiple browser process threads before a plugin instance is
+  // loaded. |mime_type| is the mime type of the plugin that will be loaded.
+  // |plugin_url| is the content URL that the plugin will load and may be NULL.
+  // |top_origin_url| is the URL for the top-level frame that contains the
+  // plugin when loading a specific plugin instance or NULL when building the
+  // initial list of enabled plugins for 'navigator.plugins' JavaScript state.
+  // |plugin_info| includes additional information about the plugin that will be
+  // loaded. |plugin_policy| is the recommended policy. Modify |plugin_policy|
+  // and return true (1) to change the policy. Return false (0) to use the
+  // recommended policy. The default plugin policy can be set at runtime using
+  // the `--plugin-policy=[allow|detect|block]` command-line flag. Decisions to
+  // mark a plugin as disabled by setting |plugin_policy| to
+  // PLUGIN_POLICY_DISABLED may be cached when |top_origin_url| is NULL. To
+  // purge the plugin list cache and potentially trigger new calls to this
+  // function call cef_request_tContext::PurgePluginListCache.
+  ///
+  int (CEF_CALLBACK *on_before_plugin_load)(
+      struct _cef_request_context_handler_t* self,
+      const cef_string_t* mime_type, const cef_string_t* plugin_url,
+      const cef_string_t* top_origin_url,
+      struct _cef_web_plugin_info_t* plugin_info,
+      cef_plugin_policy_t* plugin_policy);
 } cef_request_context_handler_t;
 
 

include/capi/cef_request_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -45,8 +45,8 @@
 #include "include/capi/cef_request_capi.h"
 #include "include/capi/cef_resource_handler_capi.h"
 #include "include/capi/cef_response_capi.h"
+#include "include/capi/cef_response_filter_capi.h"
 #include "include/capi/cef_ssl_info_capi.h"
-#include "include/capi/cef_web_plugin_capi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -163,13 +163,38 @@ typedef struct _cef_request_handler_t {
       struct _cef_browser_t* browser, struct _cef_frame_t* frame,
       struct _cef_request_t* request, struct _cef_response_t* response);
 
+  ///
+  // Called on the IO thread to optionally filter resource response content.
+  // |request| and |response| represent the request and response respectively
+  // and cannot be modified in this callback.
+  ///
+  struct _cef_response_filter_t* (CEF_CALLBACK *get_resource_response_filter)(
+      struct _cef_request_handler_t* self, struct _cef_browser_t* browser,
+      struct _cef_frame_t* frame, struct _cef_request_t* request,
+      struct _cef_response_t* response);
+
+  ///
+  // Called on the IO thread when a resource load has completed. |request| and
+  // |response| represent the request and response respectively and cannot be
+  // modified in this callback. |status| indicates the load completion status.
+  // |received_content_length| is the number of response bytes actually read.
+  ///
+  void (CEF_CALLBACK *on_resource_load_complete)(
+      struct _cef_request_handler_t* self, struct _cef_browser_t* browser,
+      struct _cef_frame_t* frame, struct _cef_request_t* request,
+      struct _cef_response_t* response, cef_urlrequest_status_t status,
+      int64 received_content_length);
+
   ///
   // Called on the IO thread when the browser needs credentials from the user.
   // |isProxy| indicates whether the host is a proxy server. |host| contains the
-  // hostname and |port| contains the port number. Return true (1) to continue
-  // the request and call cef_auth_callback_t::cont() either in this function or
-  // at a later time when the authentication information is available. Return
-  // false (0) to cancel the request immediately.
+  // hostname and |port| contains the port number. |realm| is the realm of the
+  // challenge and may be NULL. |scheme| is the authentication scheme used, such
+  // as "basic" or "digest", and will be NULL if the source of the request is an
+  // FTP server. Return true (1) to continue the request and call
+  // cef_auth_callback_t::cont() either in this function or at a later time when
+  // the authentication information is available. Return false (0) to cancel the
+  // request immediately.
   ///
   int (CEF_CALLBACK *get_auth_credentials)(struct _cef_request_handler_t* self,
       struct _cef_browser_t* browser, struct _cef_frame_t* frame, int isProxy,
@@ -204,24 +229,15 @@ typedef struct _cef_request_handler_t {
   // Called on the UI thread to handle requests for URLs with an invalid SSL
   // certificate. Return true (1) and call cef_request_tCallback::cont() either
   // in this function or at a later time to continue or cancel the request.
-  // Return false (0) to cancel the request immediately. If |callback| is NULL
-  // the error cannot be recovered from and the request will be canceled
-  // automatically. If CefSettings.ignore_certificate_errors is set all invalid
-  // certificates will be accepted without calling this function.
+  // Return false (0) to cancel the request immediately. If
+  // CefSettings.ignore_certificate_errors is set all invalid certificates will
+  // be accepted without calling this function.
   ///
   int (CEF_CALLBACK *on_certificate_error)(struct _cef_request_handler_t* self,
       struct _cef_browser_t* browser, cef_errorcode_t cert_error,
       const cef_string_t* request_url, struct _cef_sslinfo_t* ssl_info,
       struct _cef_request_callback_t* callback);
 
-  ///
-  // Called on the browser process IO thread before a plugin is loaded. Return
-  // true (1) to block loading of the plugin.
-  ///
-  int (CEF_CALLBACK *on_before_plugin_load)(struct _cef_request_handler_t* self,
-      struct _cef_browser_t* browser, const cef_string_t* url,
-      const cef_string_t* policy_url, struct _cef_web_plugin_info_t* info);
-
   ///
   // Called on the browser process UI thread when a plugin has crashed.
   // |plugin_path| is the path of the plugin that crashed.

include/capi/cef_resource_bundle_capi.h

@@ -0,0 +1,107 @@
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+
+#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_
+#pragma once
+
+#include "include/capi/cef_base_capi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+///
+// Structure used for retrieving resources from the resource bundle (*.pak)
+// files loaded by CEF during startup or via the cef_resource_bundle_tHandler
+// returned from cef_app_t::GetResourceBundleHandler. See CefSettings for
+// additional options related to resource bundle loading. The functions of this
+// structure may be called on any thread unless otherwise indicated.
+///
+typedef struct _cef_resource_bundle_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Returns the localized string for the specified |string_id| or an NULL
+  // string if the value is not found. Include cef_pack_strings.h for a listing
+  // of valid string ID values.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_localized_string)(
+      struct _cef_resource_bundle_t* self, int string_id);
+
+  ///
+  // Retrieves the contents of the specified scale independent |resource_id|. If
+  // the value is found then |data| and |data_size| will be populated and this
+  // function will return true (1). If the value is not found then this function
+  // will return false (0). The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
+  ///
+  int (CEF_CALLBACK *get_data_resource)(struct _cef_resource_bundle_t* self,
+      int resource_id, void** data, size_t* data_size);
+
+  ///
+  // Retrieves the contents of the specified |resource_id| nearest the scale
+  // factor |scale_factor|. Use a |scale_factor| value of SCALE_FACTOR_NONE for
+  // scale independent resources or call GetDataResource instead. If the value
+  // is found then |data| and |data_size| will be populated and this function
+  // will return true (1). If the value is not found then this function will
+  // return false (0). The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
+  ///
+  int (CEF_CALLBACK *get_data_resource_for_scale)(
+      struct _cef_resource_bundle_t* self, int resource_id,
+      cef_scale_factor_t scale_factor, void** data, size_t* data_size);
+} cef_resource_bundle_t;
+
+
+///
+// Returns the global resource bundle instance.
+///
+CEF_EXPORT cef_resource_bundle_t* cef_resource_bundle_get_global();
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_

include/capi/cef_resource_bundle_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -46,8 +46,9 @@ extern "C" {
 
 
 ///
-// Structure used to implement a custom resource bundle structure. The functions
-// of this structure may be called on multiple threads.
+// Structure used to implement a custom resource bundle structure. See
+// CefSettings for additional options related to resource bundle loading. The
+// functions of this structure may be called on multiple threads.
 ///
 typedef struct _cef_resource_bundle_handler_t {
   ///
@@ -56,26 +57,38 @@ typedef struct _cef_resource_bundle_handler_t {
   cef_base_t base;
 
   ///
-  // Called to retrieve a localized translation for the string specified by
-  // |message_id|. To provide the translation set |string| to the translation
-  // string and return true (1). To use the default translation return false
-  // (0). Supported message IDs are listed in cef_pack_strings.h.
+  // Called to retrieve a localized translation for the specified |string_id|.
+  // To provide the translation set |string| to the translation string and
+  // return true (1). To use the default translation return false (0). Include
+  // cef_pack_strings.h for a listing of valid string ID values.
   ///
   int (CEF_CALLBACK *get_localized_string)(
-      struct _cef_resource_bundle_handler_t* self, int message_id,
+      struct _cef_resource_bundle_handler_t* self, int string_id,
       cef_string_t* string);
 
   ///
-  // Called to retrieve data for the resource specified by |resource_id|. To
-  // provide the resource data set |data| and |data_size| to the data pointer
+  // Called to retrieve data for the specified scale independent |resource_id|.
+  // To provide the resource data set |data| and |data_size| to the data pointer
   // and size respectively and return true (1). To use the default resource data
   // return false (0). The resource data will not be copied and must remain
-  // resident in memory. Supported resource IDs are listed in
-  // cef_pack_resources.h.
+  // resident in memory. Include cef_pack_resources.h for a listing of valid
+  // resource ID values.
   ///
   int (CEF_CALLBACK *get_data_resource)(
       struct _cef_resource_bundle_handler_t* self, int resource_id, void** data,
       size_t* data_size);
+
+  ///
+  // Called to retrieve data for the specified |resource_id| nearest the scale
+  // factor |scale_factor|. To provide the resource data set |data| and
+  // |data_size| to the data pointer and size respectively and return true (1).
+  // To use the default resource data return false (0). The resource data will
+  // not be copied and must remain resident in memory. Include
+  // cef_pack_resources.h for a listing of valid resource ID values.
+  ///
+  int (CEF_CALLBACK *get_data_resource_for_scale)(
+      struct _cef_resource_bundle_handler_t* self, int resource_id,
+      cef_scale_factor_t scale_factor, void** data, size_t* data_size);
 } cef_resource_bundle_handler_t;
 
 

include/capi/cef_resource_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -78,7 +78,8 @@ typedef struct _cef_resource_handler_t {
   // (0) or the specified number of bytes have been read. Use the |response|
   // object to set the mime type, http status code and other optional header
   // values. To redirect the request to a new URL set |redirectUrl| to the new
-  // URL.
+  // URL. If an error occured while setting up the request you can call
+  // set_error() on |response| to indicate the error condition.
   ///
   void (CEF_CALLBACK *get_response_headers)(
       struct _cef_resource_handler_t* self, struct _cef_response_t* response,

include/capi/cef_response_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,6 +60,18 @@ typedef struct _cef_response_t {
   ///
   int (CEF_CALLBACK *is_read_only)(struct _cef_response_t* self);
 
+  ///
+  // Get the response error code. Returns ERR_NONE if there was no error.
+  ///
+  cef_errorcode_t (CEF_CALLBACK *get_error)(struct _cef_response_t* self);
+
+  ///
+  // Set the response error code. This can be used by custom scheme handlers to
+  // return errors during initial request processing.
+  ///
+  void (CEF_CALLBACK *set_error)(struct _cef_response_t* self,
+      cef_errorcode_t error);
+
   ///
   // Get the response status code.
   ///

include/capi/cef_response_filter_capi.h

@@ -0,0 +1,93 @@
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+
+#ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_FILTER_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_RESPONSE_FILTER_CAPI_H_
+#pragma once
+
+#include "include/capi/cef_base_capi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+///
+// Implement this structure to filter resource response content. The functions
+// of this structure will be called on the browser process IO thread.
+///
+typedef struct _cef_response_filter_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Initialize the response filter. Will only be called a single time. The
+  // filter will not be installed if this function returns false (0).
+  ///
+  int (CEF_CALLBACK *init_filter)(struct _cef_response_filter_t* self);
+
+  ///
+  // Called to filter a chunk of data. |data_in| is the input buffer containing
+  // |data_in_size| bytes of pre-filter data (|data_in| will be NULL if
+  // |data_in_size| is zero). |data_out| is the output buffer that can accept up
+  // to |data_out_size| bytes of filtered output data. Set |data_in_read| to the
+  // number of bytes that were read from |data_in|. Set |data_out_written| to
+  // the number of bytes that were written into |data_out|. If some or all of
+  // the pre-filter data was read successfully but more data is needed in order
+  // to continue filtering (filtered output is pending) return
+  // RESPONSE_FILTER_NEED_MORE_DATA. If some or all of the pre-filter data was
+  // read successfully and all available filtered output has been written return
+  // RESPONSE_FILTER_DONE. If an error occurs during filtering return
+  // RESPONSE_FILTER_ERROR. This function will be called repeatedly until there
+  // is no more data to filter (resource response is complete), |data_in_read|
+  // matches |data_in_size| (all available pre-filter bytes have been read), and
+  // the function returns RESPONSE_FILTER_DONE or RESPONSE_FILTER_ERROR. Do not
+  // keep a reference to the buffers passed to this function.
+  ///
+  cef_response_filter_status_t (CEF_CALLBACK *filter)(
+      struct _cef_response_filter_t* self, void* data_in, size_t data_in_size,
+      size_t* data_in_read, void* data_out, size_t data_out_size,
+      size_t* data_out_written);
+} cef_response_filter_t;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_CEF_RESPONSE_FILTER_CAPI_H_

include/capi/cef_scheme_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_ssl_info_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -126,6 +126,24 @@ typedef struct _cef_sslinfo_t {
   ///
   cef_base_t base;
 
+  ///
+  // Returns a bitmask containing any and all problems verifying the server
+  // certificate.
+  ///
+  cef_cert_status_t (CEF_CALLBACK *get_cert_status)(
+      struct _cef_sslinfo_t* self);
+
+  ///
+  // Returns true (1) if the certificate status has any error, major or minor.
+  ///
+  int (CEF_CALLBACK *is_cert_status_error)(struct _cef_sslinfo_t* self);
+
+  ///
+  // Returns true (1) if the certificate status represents only minor errors
+  // (e.g. failure to verify certificate revocation).
+  ///
+  int (CEF_CALLBACK *is_cert_status_minor_error)(struct _cef_sslinfo_t* self);
+
   ///
   // Returns the subject of the X.509 certificate. For HTTPS server certificates
   // this represents the web server.  The common name of the subject should
@@ -170,6 +188,28 @@ typedef struct _cef_sslinfo_t {
   ///
   struct _cef_binary_value_t* (CEF_CALLBACK *get_pemencoded)(
       struct _cef_sslinfo_t* self);
+
+  ///
+  // Returns the number of certificates in the issuer chain. If 0, the
+  // certificate is self-signed.
+  ///
+  size_t (CEF_CALLBACK *get_issuer_chain_size)(struct _cef_sslinfo_t* self);
+
+  ///
+  // Returns the DER encoded data for the certificate issuer chain. If we failed
+  // to encode a certificate in the chain it is still present in the array but
+  // is an NULL string.
+  ///
+  void (CEF_CALLBACK *get_derencoded_issuer_chain)(struct _cef_sslinfo_t* self,
+      size_t* chainCount, struct _cef_binary_value_t** chain);
+
+  ///
+  // Returns the PEM encoded data for the certificate issuer chain. If we failed
+  // to encode a certificate in the chain it is still present in the array but
+  // is an NULL string.
+  ///
+  void (CEF_CALLBACK *get_pemencoded_issuer_chain)(struct _cef_sslinfo_t* self,
+      size_t* chainCount, struct _cef_binary_value_t** chain);
 } cef_sslinfo_t;
 
 

include/capi/cef_stream_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_string_visitor_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_task_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_trace_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_urlrequest_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_v8_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_values_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_web_plugin_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -39,12 +39,12 @@
 #pragma once
 
 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct _cef_browser_t;
 
 ///
 // Information about a specific web plugin.
@@ -141,27 +141,6 @@ CEF_EXPORT void cef_visit_web_plugin_info(
 ///
 CEF_EXPORT void cef_refresh_web_plugins();
 
-///
-// Add a plugin path (directory + file). This change may not take affect until
-// after cef_refresh_web_plugins() is called. Can be called on any thread in the
-// browser process.
-///
-CEF_EXPORT void cef_add_web_plugin_path(const cef_string_t* path);
-
-///
-// Add a plugin directory. This change may not take affect until after
-// cef_refresh_web_plugins() is called. Can be called on any thread in the
-// browser process.
-///
-CEF_EXPORT void cef_add_web_plugin_directory(const cef_string_t* dir);
-
-///
-// Remove a plugin path (directory + file). This change may not take affect
-// until after cef_refresh_web_plugins() is called. Can be called on any thread
-// in the browser process.
-///
-CEF_EXPORT void cef_remove_web_plugin_path(const cef_string_t* path);
-
 ///
 // Unregister an internal plugin. This may be undone the next time
 // cef_refresh_web_plugins() is called. Can be called on any thread in the
@@ -169,12 +148,6 @@ CEF_EXPORT void cef_remove_web_plugin_path(const cef_string_t* path);
 ///
 CEF_EXPORT void cef_unregister_internal_web_plugin(const cef_string_t* path);
 
-///
-// Force a plugin to shutdown. Can be called on any thread in the browser
-// process but will be executed on the IO thread.
-///
-CEF_EXPORT void cef_force_web_plugin_shutdown(const cef_string_t* path);
-
 ///
 // Register a plugin crash. Can be called on any thread in the browser process
 // but will be executed on the IO thread.

include/capi/cef_xml_reader_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/cef_zip_reader_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/test/cef_translator_test_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

include/capi/views/cef_box_layout_capi.h

@@ -0,0 +1,86 @@
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+
+#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BOX_LAYOUT_CAPI_H_
+#define CEF_INCLUDE_CAPI_VIEWS_CEF_BOX_LAYOUT_CAPI_H_
+#pragma once
+
+#include "include/capi/views/cef_layout_capi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _cef_view_t;
+
+///
+// A Layout manager that arranges child views vertically or horizontally in a
+// side-by-side fashion with spacing around and between the child views. The
+// child views are always sized according to their preferred size. If the host's
+// bounds provide insufficient space, child views will be clamped. Excess space
+// will not be distributed. Methods must be called on the browser process UI
+// thread unless otherwise indicated.
+///
+typedef struct _cef_box_layout_t {
+  ///
+  // Base structure.
+  ///
+  cef_layout_t base;
+
+  ///
+  // Set the flex weight for the given |view|. Using the preferred size as the
+  // basis, free space along the main axis is distributed to views in the ratio
+  // of their flex weights. Similarly, if the views will overflow the parent,
+  // space is subtracted in these ratios. A flex of 0 means this view is not
+  // resized. Flex values must not be negative.
+  ///
+  void (CEF_CALLBACK *set_flex_for_view)(struct _cef_box_layout_t* self,
+      struct _cef_view_t* view, int flex);
+
+  ///
+  // Clears the flex for the given |view|, causing it to use the default flex
+  // specified via cef_box_layout_tSettings.default_flex.
+  ///
+  void (CEF_CALLBACK *clear_flex_for_view)(struct _cef_box_layout_t* self,
+      struct _cef_view_t* view);
+} cef_box_layout_t;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_VIEWS_CEF_BOX_LAYOUT_CAPI_H_

include/capi/views/cef_browser_view_capi.h

@@ -0,0 +1,90 @@
+// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+
+#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_
+#define CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_
+#pragma once
+
+#include "include/capi/cef_browser_capi.h"
+#include "include/capi/views/cef_browser_view_delegate_capi.h"
+#include "include/capi/views/cef_view_capi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+///
+// A View hosting a cef_browser_t instance. Methods must be called on the
+// browser process UI thread unless otherwise indicated.
+///
+typedef struct _cef_browser_view_t {
+  ///
+  // Base structure.
+  ///
+  cef_view_t base;
+
+  ///
+  // Returns the cef_browser_t hosted by this BrowserView. Will return NULL if
+  // the browser has not yet been created or has already been destroyed.
+  ///
+  struct _cef_browser_t* (CEF_CALLBACK *get_browser)(
+      struct _cef_browser_view_t* self);
+} cef_browser_view_t;
+
+
+///
+// Create a new BrowserView. The underlying cef_browser_t will not be created
+// until this view is added to the views hierarchy.
+///
+CEF_EXPORT cef_browser_view_t* cef_browser_view_create(
+    struct _cef_client_t* client, const cef_string_t* url,
+    const struct _cef_browser_settings_t* settings,
+    struct _cef_request_context_t* request_context,
+    struct _cef_browser_view_delegate_t* delegate);
+
+///
+// Returns the BrowserView associated with |browser|.
+///
+CEF_EXPORT cef_browser_view_t* cef_browser_view_get_for_browser(
+    struct _cef_browser_t* browser);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_