diff --git a/common/simple_app.cc b/common/simple_app.cc index 2473994..3fbee06 100644 --- a/common/simple_app.cc +++ b/common/simple_app.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. diff --git a/common/simple_app.h b/common/simple_app.h index 8c79b45..7b3123f 100644 --- a/common/simple_app.h +++ b/common/simple_app.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. @@ -23,8 +23,10 @@ public: CefRefPtr command_line) override { command_line->AppendSwitch("disable-gpu"); command_line->AppendSwitch("disable-gpu-compositing"); - command_line->AppendSwitch("use-mock-keychain"); - command_line->AppendSwitch("single-process"); + #ifdef __APPLE__ + command_line->AppendSwitch("use-mock-keychain"); + command_line->AppendSwitch("single-process"); + #endif } // CefBrowserProcessHandler methods: diff --git a/common/simple_handler.cc b/common/simple_handler.cc index ff20be5..dba846e 100644 --- a/common/simple_handler.cc +++ b/common/simple_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. diff --git a/common/simple_handler.h b/common/simple_handler.h index 09ddb3c..4daed61 100644 --- a/common/simple_handler.h +++ b/common/simple_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index c63ee11..b320e51 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -23,11 +23,10 @@ set(PLUGIN_NAME "webview_cef_plugin") list(APPEND PLUGIN_SOURCES "webview_cef_plugin.cpp" "webview_cef_plugin.h" - "simple_app.cc" - "simple_app.h" - "simple_handler.cc" - "simple_handler.h" - "simple_handler_win.cc" + "${CMAKE_CURRENT_LIST_DIR}/../common/simple_app.cc" + "${CMAKE_CURRENT_LIST_DIR}/../common/simple_app.h" + "${CMAKE_CURRENT_LIST_DIR}/../common/simple_handler.cc" + "${CMAKE_CURRENT_LIST_DIR}/../common/simple_handler.h" ) # Define the plugin library target. Its name must not be changed (see comment @@ -54,6 +53,9 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) # dependencies here. target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third/cef) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common) + target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin debug ${CMAKE_CURRENT_SOURCE_DIR}/cefbins/debug/libcef.lib debug ${CMAKE_CURRENT_SOURCE_DIR}/cefbins/debug/libcef_dll_wrapper.lib diff --git a/windows/simple_app.cc b/windows/simple_app.cc deleted file mode 100644 index 20a8996..0000000 --- a/windows/simple_app.cc +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (c) 2013 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. - -#include "simple_app.h" - -#include - -#include "include/cef_browser.h" -#include "include/cef_command_line.h" -#include "include/views/cef_browser_view.h" -#include "include/views/cef_window.h" -#include "include/wrapper/cef_helpers.h" - -namespace { - -// When using the Views framework this object provides the delegate -// implementation for the CefWindow that hosts the Views-based browser. -class SimpleWindowDelegate : public CefWindowDelegate { -public: - explicit SimpleWindowDelegate(CefRefPtr browser_view) - : browser_view_(browser_view) {} - - void OnWindowCreated(CefRefPtr window) override { - // Add the browser view and show the window. - window->AddChildView(browser_view_); - window->Show(); - - // Give keyboard focus to the browser view. - browser_view_->RequestFocus(); - } - - void OnWindowDestroyed(CefRefPtr window) override { - browser_view_ = nullptr; - } - - bool CanClose(CefRefPtr window) override { - // Allow the window to close if the browser says it's OK. - CefRefPtr browser = browser_view_->GetBrowser(); - if (browser) - return browser->GetHost()->TryCloseBrowser(); - return true; - } - - CefSize GetPreferredSize(CefRefPtr view) override { - return CefSize(800, 600); - } - -private: - CefRefPtr browser_view_; - - IMPLEMENT_REFCOUNTING(SimpleWindowDelegate); - DISALLOW_COPY_AND_ASSIGN(SimpleWindowDelegate); -}; - -class SimpleBrowserViewDelegate : public CefBrowserViewDelegate { -public: - SimpleBrowserViewDelegate() {} - - bool OnPopupBrowserViewCreated(CefRefPtr browser_view, - CefRefPtr popup_browser_view, - bool is_devtools) override { - // Create a new top-level Window for the popup. It will show itself after - // creation. - CefWindow::CreateTopLevelWindow( - new SimpleWindowDelegate(popup_browser_view)); - - // We created the Window. - return true; - } - -private: - IMPLEMENT_REFCOUNTING(SimpleBrowserViewDelegate); - DISALLOW_COPY_AND_ASSIGN(SimpleBrowserViewDelegate); -}; - -} // namespace - -SimpleApp::SimpleApp(CefRefPtr handler) { - m_handler = handler; -} - -void SimpleApp::OnContextInitialized() { - CEF_REQUIRE_UI_THREAD(); - - // Specify CEF browser settings here. - CefBrowserSettings browser_settings; - browser_settings.windowless_frame_rate = 60; - - std::string url = "https://www.bilibili.com/"; - - CefWindowInfo window_info; - window_info.SetAsWindowless(nullptr); - - // Create the first browser window. - CefBrowserHost::CreateBrowser(window_info, m_handler, url, browser_settings, - nullptr, nullptr); -} - -CefRefPtr SimpleApp::GetDefaultClient() { - // Called when a new browser window is created via the Chrome runtime UI. - return SimpleHandler::GetInstance(); -} diff --git a/windows/simple_app.h b/windows/simple_app.h deleted file mode 100644 index d1dee11..0000000 --- a/windows/simple_app.h +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2013 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. - -#ifndef CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_ -#define CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_ - -#include "include/cef_app.h" -#include -#include "simple_handler.h" - -// Implement application-level callbacks for the browser process. -class SimpleApp : public CefApp, public CefBrowserProcessHandler { - public: - SimpleApp(CefRefPtr handler); - - // CefApp methods: - CefRefPtr GetBrowserProcessHandler() override { - return this; - } - void OnBeforeCommandLineProcessing( - const CefString& process_type, - CefRefPtr command_line) override { - command_line->AppendSwitch("disable-gpu"); - command_line->AppendSwitch("disable-gpu-compositing"); - command_line->AppendSwitch("enable-begin-frame-scheduling"); - command_line->AppendSwitch("enable-system-flash"); - command_line->AppendSwitch("log-severity=disable"); - } - - - // CefBrowserProcessHandler methods: - void OnContextInitialized() override; - CefRefPtr GetDefaultClient() override; - - private: - CefRefPtr m_handler; - // Include the default reference counting implementation. - IMPLEMENT_REFCOUNTING(SimpleApp); -}; - -#endif // CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_ diff --git a/windows/simple_handler.cc b/windows/simple_handler.cc deleted file mode 100644 index 832e5d0..0000000 --- a/windows/simple_handler.cc +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright (c) 2013 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. - -#include "simple_handler.h" - -#include -#include -#include - -#include "include/base/cef_callback.h" -#include "include/cef_app.h" -#include "include/cef_parser.h" -#include "include/views/cef_browser_view.h" -#include "include/views/cef_window.h" -#include "include/wrapper/cef_closure_task.h" -#include "include/wrapper/cef_helpers.h" - -namespace { - -SimpleHandler* g_instance = nullptr; - -// Returns a data: URI with the specified contents. -std::string GetDataURI(const std::string& data, const std::string& mime_type) { - return "data:" + mime_type + ";base64," + - CefURIEncode(CefBase64Encode(data.data(), data.size()), false) - .ToString(); -} - -} // namespace - -SimpleHandler::SimpleHandler(bool use_views) - : use_views_(use_views), is_closing_(false) { - DCHECK(!g_instance); - g_instance = this; -} - -SimpleHandler::~SimpleHandler() { - g_instance = nullptr; -} - -// static -SimpleHandler* SimpleHandler::GetInstance() { - return g_instance; -} - -void SimpleHandler::OnTitleChange(CefRefPtr browser, - const CefString& title) { - CEF_REQUIRE_UI_THREAD(); - - if (use_views_) { - // Set the title of the window using the Views framework. - CefRefPtr browser_view = - CefBrowserView::GetForBrowser(browser); - if (browser_view) { - CefRefPtr window = browser_view->GetWindow(); - if (window) - window->SetTitle(title); - } - } else if (!IsChromeRuntimeEnabled()) { - // Set the title of the window using platform APIs. - PlatformTitleChange(browser, title); - } -} - -void SimpleHandler::OnAfterCreated(CefRefPtr browser) { - CEF_REQUIRE_UI_THREAD(); - - // Add to the list of existing browsers. - browser_list_.push_back(browser); -} - -bool SimpleHandler::DoClose(CefRefPtr browser) { - CEF_REQUIRE_UI_THREAD(); - - // Closing the main window requires special handling. See the DoClose() - // documentation in the CEF header for a detailed destription of this - // process. - if (browser_list_.size() == 1) { - // Set a flag to indicate that the window close should be allowed. - is_closing_ = true; - } - - // Allow the close. For windowed browsers this will result in the OS close - // event being sent. - return false; -} - -void SimpleHandler::OnBeforeClose(CefRefPtr browser) { - CEF_REQUIRE_UI_THREAD(); - - // Remove from the list of existing browsers. - BrowserList::iterator bit = browser_list_.begin(); - for (; bit != browser_list_.end(); ++bit) { - if ((*bit)->IsSame(browser)) { - browser_list_.erase(bit); - break; - } - } - - if (browser_list_.empty()) { - // All browser windows have closed. Quit the application message loop. - CefQuitMessageLoop(); - } -} - -void SimpleHandler::OnLoadError(CefRefPtr browser, - CefRefPtr frame, - ErrorCode errorCode, - const CefString& errorText, - const CefString& failedUrl) { - CEF_REQUIRE_UI_THREAD(); - - // Allow Chrome to show the error page. - if (IsChromeRuntimeEnabled()) - return; - - // Don't display an error for downloaded files. - if (errorCode == ERR_ABORTED) - return; - - // Display a load error message using a data: URI. - std::stringstream ss; - ss << "" - "

Failed to load URL " - << std::string(failedUrl) << " with error " << std::string(errorText) - << " (" << errorCode << ").

"; - - frame->LoadURL(GetDataURI(ss.str(), "text/html")); -} - -void SimpleHandler::CloseAllBrowsers(bool force_close) { - if (!CefCurrentlyOn(TID_UI)) { - // Execute on the UI thread. -// CefPostTask(TID_UI, base::BindOnce(&SimpleHandler::CloseAllBrowsers, this, -// force_close)); - return; - } - - if (browser_list_.empty()) - return; - - BrowserList::const_iterator it = browser_list_.begin(); - for (; it != browser_list_.end(); ++it) - (*it)->GetHost()->CloseBrowser(force_close); -} - -// static -bool SimpleHandler::IsChromeRuntimeEnabled() { - static int value = -1; - if (value == -1) { - CefRefPtr command_line = - CefCommandLine::GetGlobalCommandLine(); - value = command_line->HasSwitch("enable-chrome-runtime") ? 1 : 0; - } - return value == 1; -} - -void SimpleHandler::scrollUp() -{ - BrowserList::const_iterator it = browser_list_.begin(); - if (it != browser_list_.end()) { - CefMouseEvent ev; - ev.x = 500; - ev.y = 500; - (*it)->GetHost()->SendMouseWheelEvent(ev, 0, -100); - } -} - -void SimpleHandler::scrollDown() -{ - BrowserList::const_iterator it = browser_list_.begin(); - if (it != browser_list_.end()) { - CefMouseEvent ev; - ev.x = 500; - ev.y = 500; - (*it)->GetHost()->SendMouseWheelEvent(ev, 0, 100); - } -} - -void SimpleHandler::changeSize(int w, int h) -{ -// this->width = w; -// this->height = h; - BrowserList::const_iterator it = browser_list_.begin(); - if (it != browser_list_.end()) { - (*it)->GetHost()->WasResized(); - } -} - -void SimpleHandler::cursorClick(int x, int y, bool up) -{ - BrowserList::const_iterator it = browser_list_.begin(); - if (it != browser_list_.end()) { - CefMouseEvent ev; - ev.x = x; - ev.y = y; - (*it)->GetHost()->SendMouseClickEvent(ev, CefBrowserHost::MouseButtonType::MBT_LEFT, up, 1); - } -} - -void SimpleHandler::loadUrl(std::string url) -{ - BrowserList::const_iterator it = browser_list_.begin(); - if (it != browser_list_.end()) { - (*it)->GetMainFrame()->LoadURL(url); - } -} - -void SimpleHandler::GetViewRect(CefRefPtr browser, CefRect &rect) { - rect.x = rect.y = 0; - rect.width = width; - rect.height = height; - return; -} - -void SimpleHandler::OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, - const CefRenderHandler::RectList &dirtyRects, const void *buffer, int w, int h) { - onPaintCallback(buffer, w, h); -} - -void SimpleHandler::PlatformTitleChange(CefRefPtr browser, - const CefString& title) { -} - diff --git a/windows/simple_handler.h b/windows/simple_handler.h deleted file mode 100644 index dc56eb8..0000000 --- a/windows/simple_handler.h +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) 2013 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. - -#ifndef CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_ -#define CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_ - -#include "include/cef_client.h" - -#include -#include - -class SimpleHandler : public CefClient, - public CefDisplayHandler, - public CefLifeSpanHandler, - public CefLoadHandler, - public CefRenderHandler{ - public: - std::function onPaintCallback; - explicit SimpleHandler(bool use_views); - ~SimpleHandler(); - - // Provide access to the single global instance of this object. - static SimpleHandler* GetInstance(); - - // CefClient methods: - virtual CefRefPtr GetDisplayHandler() override { - return this; - } - virtual CefRefPtr GetLifeSpanHandler() override { - return this; - } - virtual CefRefPtr GetLoadHandler() override { return this; } - - virtual CefRefPtr GetRenderHandler() override { return this; } //新加的 - - // CefDisplayHandler methods: - virtual void OnTitleChange(CefRefPtr browser, - const CefString& title) override; - - // CefLifeSpanHandler methods: - virtual void OnAfterCreated(CefRefPtr browser) override; - virtual bool DoClose(CefRefPtr browser) override; - virtual void OnBeforeClose(CefRefPtr browser) override; - - // CefLoadHandler methods: - virtual void OnLoadError(CefRefPtr browser, - CefRefPtr frame, - ErrorCode errorCode, - const CefString& errorText, - const CefString& failedUrl) override; - - virtual void GetViewRect(CefRefPtr browser, CefRect& rect) override; - - virtual void OnPaint(CefRefPtr browser, PaintElementType type, const RectList& dirtyRects, const void* buffer, int width, int height) override; - - // Request that all existing browser windows close. - void CloseAllBrowsers(bool force_close); - - bool IsClosing() const { return is_closing_; } - - // Returns true if the Chrome runtime is enabled. - static bool IsChromeRuntimeEnabled(); - - void scrollUp(); - - void scrollDown(); - - void changeSize(int width, int height); - - void cursorClick(int x, int y, bool up); - - void loadUrl(std::string url); - - private: - uint32_t width = 1920; - uint32_t height = 1080; - - // Platform-specific implementation. - void PlatformTitleChange(CefRefPtr browser, - const CefString& title); - - // True if the application is using the Views framework. - const bool use_views_; - - // List of existing browser windows. Only accessed on the CEF UI thread. - typedef std::list> BrowserList; - BrowserList browser_list_; - - bool is_closing_; - - // Include the default reference counting implementation. - IMPLEMENT_REFCOUNTING(SimpleHandler); -}; - -#endif // CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_ diff --git a/windows/simple_handler_win.cc b/windows/simple_handler_win.cc deleted file mode 100644 index 74612ad..0000000 --- a/windows/simple_handler_win.cc +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2013 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. - -#include "simple_handler.h" - -#include -#include - -#include "include/cef_browser.h" - -void SimpleHandler::PlatformTitleChange(CefRefPtr browser, - const CefString& title) { -} diff --git a/windows/include/base/cef_atomic_flag.h b/windows/third/cef/include/base/cef_atomic_flag.h similarity index 100% rename from windows/include/base/cef_atomic_flag.h rename to windows/third/cef/include/base/cef_atomic_flag.h diff --git a/windows/include/base/cef_atomic_ref_count.h b/windows/third/cef/include/base/cef_atomic_ref_count.h similarity index 100% rename from windows/include/base/cef_atomic_ref_count.h rename to windows/third/cef/include/base/cef_atomic_ref_count.h diff --git a/windows/include/base/cef_auto_reset.h b/windows/third/cef/include/base/cef_auto_reset.h similarity index 100% rename from windows/include/base/cef_auto_reset.h rename to windows/third/cef/include/base/cef_auto_reset.h diff --git a/windows/include/base/cef_basictypes.h b/windows/third/cef/include/base/cef_basictypes.h similarity index 100% rename from windows/include/base/cef_basictypes.h rename to windows/third/cef/include/base/cef_basictypes.h diff --git a/windows/include/base/cef_bind.h b/windows/third/cef/include/base/cef_bind.h similarity index 100% rename from windows/include/base/cef_bind.h rename to windows/third/cef/include/base/cef_bind.h diff --git a/windows/include/base/cef_build.h b/windows/third/cef/include/base/cef_build.h similarity index 100% rename from windows/include/base/cef_build.h rename to windows/third/cef/include/base/cef_build.h diff --git a/windows/include/base/cef_callback.h b/windows/third/cef/include/base/cef_callback.h similarity index 100% rename from windows/include/base/cef_callback.h rename to windows/third/cef/include/base/cef_callback.h diff --git a/windows/include/base/cef_callback_forward.h b/windows/third/cef/include/base/cef_callback_forward.h similarity index 100% rename from windows/include/base/cef_callback_forward.h rename to windows/third/cef/include/base/cef_callback_forward.h diff --git a/windows/include/base/cef_callback_helpers.h b/windows/third/cef/include/base/cef_callback_helpers.h similarity index 100% rename from windows/include/base/cef_callback_helpers.h rename to windows/third/cef/include/base/cef_callback_helpers.h diff --git a/windows/include/base/cef_callback_list.h b/windows/third/cef/include/base/cef_callback_list.h similarity index 100% rename from windows/include/base/cef_callback_list.h rename to windows/third/cef/include/base/cef_callback_list.h diff --git a/windows/include/base/cef_cancelable_callback.h b/windows/third/cef/include/base/cef_cancelable_callback.h similarity index 100% rename from windows/include/base/cef_cancelable_callback.h rename to windows/third/cef/include/base/cef_cancelable_callback.h diff --git a/windows/include/base/cef_compiler_specific.h b/windows/third/cef/include/base/cef_compiler_specific.h similarity index 100% rename from windows/include/base/cef_compiler_specific.h rename to windows/third/cef/include/base/cef_compiler_specific.h diff --git a/windows/include/base/cef_cxx17_backports.h b/windows/third/cef/include/base/cef_cxx17_backports.h similarity index 100% rename from windows/include/base/cef_cxx17_backports.h rename to windows/third/cef/include/base/cef_cxx17_backports.h diff --git a/windows/include/base/cef_lock.h b/windows/third/cef/include/base/cef_lock.h similarity index 100% rename from windows/include/base/cef_lock.h rename to windows/third/cef/include/base/cef_lock.h diff --git a/windows/include/base/cef_logging.h b/windows/third/cef/include/base/cef_logging.h similarity index 100% rename from windows/include/base/cef_logging.h rename to windows/third/cef/include/base/cef_logging.h diff --git a/windows/include/base/cef_macros.h b/windows/third/cef/include/base/cef_macros.h similarity index 100% rename from windows/include/base/cef_macros.h rename to windows/third/cef/include/base/cef_macros.h diff --git a/windows/include/base/cef_platform_thread.h b/windows/third/cef/include/base/cef_platform_thread.h similarity index 100% rename from windows/include/base/cef_platform_thread.h rename to windows/third/cef/include/base/cef_platform_thread.h diff --git a/windows/include/base/cef_ptr_util.h b/windows/third/cef/include/base/cef_ptr_util.h similarity index 100% rename from windows/include/base/cef_ptr_util.h rename to windows/third/cef/include/base/cef_ptr_util.h diff --git a/windows/include/base/cef_ref_counted.h b/windows/third/cef/include/base/cef_ref_counted.h similarity index 100% rename from windows/include/base/cef_ref_counted.h rename to windows/third/cef/include/base/cef_ref_counted.h diff --git a/windows/include/base/cef_scoped_refptr.h b/windows/third/cef/include/base/cef_scoped_refptr.h similarity index 100% rename from windows/include/base/cef_scoped_refptr.h rename to windows/third/cef/include/base/cef_scoped_refptr.h diff --git a/windows/include/base/cef_template_util.h b/windows/third/cef/include/base/cef_template_util.h similarity index 100% rename from windows/include/base/cef_template_util.h rename to windows/third/cef/include/base/cef_template_util.h diff --git a/windows/include/base/cef_thread_checker.h b/windows/third/cef/include/base/cef_thread_checker.h similarity index 100% rename from windows/include/base/cef_thread_checker.h rename to windows/third/cef/include/base/cef_thread_checker.h diff --git a/windows/include/base/cef_trace_event.h b/windows/third/cef/include/base/cef_trace_event.h similarity index 100% rename from windows/include/base/cef_trace_event.h rename to windows/third/cef/include/base/cef_trace_event.h diff --git a/windows/include/base/cef_tuple.h b/windows/third/cef/include/base/cef_tuple.h similarity index 100% rename from windows/include/base/cef_tuple.h rename to windows/third/cef/include/base/cef_tuple.h diff --git a/windows/include/base/cef_weak_ptr.h b/windows/third/cef/include/base/cef_weak_ptr.h similarity index 100% rename from windows/include/base/cef_weak_ptr.h rename to windows/third/cef/include/base/cef_weak_ptr.h diff --git a/windows/include/base/internal/README-TRANSFER.txt b/windows/third/cef/include/base/internal/README-TRANSFER.txt similarity index 100% rename from windows/include/base/internal/README-TRANSFER.txt rename to windows/third/cef/include/base/internal/README-TRANSFER.txt diff --git a/windows/include/base/internal/cef_bind_internal.h b/windows/third/cef/include/base/internal/cef_bind_internal.h similarity index 100% rename from windows/include/base/internal/cef_bind_internal.h rename to windows/third/cef/include/base/internal/cef_bind_internal.h diff --git a/windows/include/base/internal/cef_callback_internal.h b/windows/third/cef/include/base/internal/cef_callback_internal.h similarity index 100% rename from windows/include/base/internal/cef_callback_internal.h rename to windows/third/cef/include/base/internal/cef_callback_internal.h diff --git a/windows/include/base/internal/cef_lock_impl.h b/windows/third/cef/include/base/internal/cef_lock_impl.h similarity index 100% rename from windows/include/base/internal/cef_lock_impl.h rename to windows/third/cef/include/base/internal/cef_lock_impl.h diff --git a/windows/include/base/internal/cef_net_error_list.h b/windows/third/cef/include/base/internal/cef_net_error_list.h similarity index 100% rename from windows/include/base/internal/cef_net_error_list.h rename to windows/third/cef/include/base/internal/cef_net_error_list.h diff --git a/windows/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h b/windows/third/cef/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h similarity index 100% rename from windows/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h rename to windows/third/cef/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h diff --git a/windows/include/base/internal/cef_scoped_policy.h b/windows/third/cef/include/base/internal/cef_scoped_policy.h similarity index 100% rename from windows/include/base/internal/cef_scoped_policy.h rename to windows/third/cef/include/base/internal/cef_scoped_policy.h diff --git a/windows/include/base/internal/cef_thread_checker_impl.h b/windows/third/cef/include/base/internal/cef_thread_checker_impl.h similarity index 100% rename from windows/include/base/internal/cef_thread_checker_impl.h rename to windows/third/cef/include/base/internal/cef_thread_checker_impl.h diff --git a/windows/include/capi/cef_accessibility_handler_capi.h b/windows/third/cef/include/capi/cef_accessibility_handler_capi.h similarity index 100% rename from windows/include/capi/cef_accessibility_handler_capi.h rename to windows/third/cef/include/capi/cef_accessibility_handler_capi.h diff --git a/windows/include/capi/cef_app_capi.h b/windows/third/cef/include/capi/cef_app_capi.h similarity index 100% rename from windows/include/capi/cef_app_capi.h rename to windows/third/cef/include/capi/cef_app_capi.h diff --git a/windows/include/capi/cef_audio_handler_capi.h b/windows/third/cef/include/capi/cef_audio_handler_capi.h similarity index 100% rename from windows/include/capi/cef_audio_handler_capi.h rename to windows/third/cef/include/capi/cef_audio_handler_capi.h diff --git a/windows/include/capi/cef_auth_callback_capi.h b/windows/third/cef/include/capi/cef_auth_callback_capi.h similarity index 100% rename from windows/include/capi/cef_auth_callback_capi.h rename to windows/third/cef/include/capi/cef_auth_callback_capi.h diff --git a/windows/include/capi/cef_base_capi.h b/windows/third/cef/include/capi/cef_base_capi.h similarity index 100% rename from windows/include/capi/cef_base_capi.h rename to windows/third/cef/include/capi/cef_base_capi.h diff --git a/windows/include/capi/cef_browser_capi.h b/windows/third/cef/include/capi/cef_browser_capi.h similarity index 100% rename from windows/include/capi/cef_browser_capi.h rename to windows/third/cef/include/capi/cef_browser_capi.h diff --git a/windows/include/capi/cef_browser_process_handler_capi.h b/windows/third/cef/include/capi/cef_browser_process_handler_capi.h similarity index 100% rename from windows/include/capi/cef_browser_process_handler_capi.h rename to windows/third/cef/include/capi/cef_browser_process_handler_capi.h diff --git a/windows/include/capi/cef_callback_capi.h b/windows/third/cef/include/capi/cef_callback_capi.h similarity index 100% rename from windows/include/capi/cef_callback_capi.h rename to windows/third/cef/include/capi/cef_callback_capi.h diff --git a/windows/include/capi/cef_client_capi.h b/windows/third/cef/include/capi/cef_client_capi.h similarity index 100% rename from windows/include/capi/cef_client_capi.h rename to windows/third/cef/include/capi/cef_client_capi.h diff --git a/windows/include/capi/cef_command_handler_capi.h b/windows/third/cef/include/capi/cef_command_handler_capi.h similarity index 100% rename from windows/include/capi/cef_command_handler_capi.h rename to windows/third/cef/include/capi/cef_command_handler_capi.h diff --git a/windows/include/capi/cef_command_line_capi.h b/windows/third/cef/include/capi/cef_command_line_capi.h similarity index 100% rename from windows/include/capi/cef_command_line_capi.h rename to windows/third/cef/include/capi/cef_command_line_capi.h diff --git a/windows/include/capi/cef_context_menu_handler_capi.h b/windows/third/cef/include/capi/cef_context_menu_handler_capi.h similarity index 100% rename from windows/include/capi/cef_context_menu_handler_capi.h rename to windows/third/cef/include/capi/cef_context_menu_handler_capi.h diff --git a/windows/include/capi/cef_cookie_capi.h b/windows/third/cef/include/capi/cef_cookie_capi.h similarity index 100% rename from windows/include/capi/cef_cookie_capi.h rename to windows/third/cef/include/capi/cef_cookie_capi.h diff --git a/windows/include/capi/cef_crash_util_capi.h b/windows/third/cef/include/capi/cef_crash_util_capi.h similarity index 100% rename from windows/include/capi/cef_crash_util_capi.h rename to windows/third/cef/include/capi/cef_crash_util_capi.h diff --git a/windows/include/capi/cef_devtools_message_observer_capi.h b/windows/third/cef/include/capi/cef_devtools_message_observer_capi.h similarity index 100% rename from windows/include/capi/cef_devtools_message_observer_capi.h rename to windows/third/cef/include/capi/cef_devtools_message_observer_capi.h diff --git a/windows/include/capi/cef_dialog_handler_capi.h b/windows/third/cef/include/capi/cef_dialog_handler_capi.h similarity index 100% rename from windows/include/capi/cef_dialog_handler_capi.h rename to windows/third/cef/include/capi/cef_dialog_handler_capi.h diff --git a/windows/include/capi/cef_display_handler_capi.h b/windows/third/cef/include/capi/cef_display_handler_capi.h similarity index 100% rename from windows/include/capi/cef_display_handler_capi.h rename to windows/third/cef/include/capi/cef_display_handler_capi.h diff --git a/windows/include/capi/cef_dom_capi.h b/windows/third/cef/include/capi/cef_dom_capi.h similarity index 100% rename from windows/include/capi/cef_dom_capi.h rename to windows/third/cef/include/capi/cef_dom_capi.h diff --git a/windows/include/capi/cef_download_handler_capi.h b/windows/third/cef/include/capi/cef_download_handler_capi.h similarity index 100% rename from windows/include/capi/cef_download_handler_capi.h rename to windows/third/cef/include/capi/cef_download_handler_capi.h diff --git a/windows/include/capi/cef_download_item_capi.h b/windows/third/cef/include/capi/cef_download_item_capi.h similarity index 100% rename from windows/include/capi/cef_download_item_capi.h rename to windows/third/cef/include/capi/cef_download_item_capi.h diff --git a/windows/include/capi/cef_drag_data_capi.h b/windows/third/cef/include/capi/cef_drag_data_capi.h similarity index 100% rename from windows/include/capi/cef_drag_data_capi.h rename to windows/third/cef/include/capi/cef_drag_data_capi.h diff --git a/windows/include/capi/cef_drag_handler_capi.h b/windows/third/cef/include/capi/cef_drag_handler_capi.h similarity index 100% rename from windows/include/capi/cef_drag_handler_capi.h rename to windows/third/cef/include/capi/cef_drag_handler_capi.h diff --git a/windows/include/capi/cef_extension_capi.h b/windows/third/cef/include/capi/cef_extension_capi.h similarity index 100% rename from windows/include/capi/cef_extension_capi.h rename to windows/third/cef/include/capi/cef_extension_capi.h diff --git a/windows/include/capi/cef_extension_handler_capi.h b/windows/third/cef/include/capi/cef_extension_handler_capi.h similarity index 100% rename from windows/include/capi/cef_extension_handler_capi.h rename to windows/third/cef/include/capi/cef_extension_handler_capi.h diff --git a/windows/include/capi/cef_file_util_capi.h b/windows/third/cef/include/capi/cef_file_util_capi.h similarity index 100% rename from windows/include/capi/cef_file_util_capi.h rename to windows/third/cef/include/capi/cef_file_util_capi.h diff --git a/windows/include/capi/cef_find_handler_capi.h b/windows/third/cef/include/capi/cef_find_handler_capi.h similarity index 100% rename from windows/include/capi/cef_find_handler_capi.h rename to windows/third/cef/include/capi/cef_find_handler_capi.h diff --git a/windows/include/capi/cef_focus_handler_capi.h b/windows/third/cef/include/capi/cef_focus_handler_capi.h similarity index 100% rename from windows/include/capi/cef_focus_handler_capi.h rename to windows/third/cef/include/capi/cef_focus_handler_capi.h diff --git a/windows/include/capi/cef_frame_capi.h b/windows/third/cef/include/capi/cef_frame_capi.h similarity index 100% rename from windows/include/capi/cef_frame_capi.h rename to windows/third/cef/include/capi/cef_frame_capi.h diff --git a/windows/include/capi/cef_frame_handler_capi.h b/windows/third/cef/include/capi/cef_frame_handler_capi.h similarity index 100% rename from windows/include/capi/cef_frame_handler_capi.h rename to windows/third/cef/include/capi/cef_frame_handler_capi.h diff --git a/windows/include/capi/cef_i18n_util_capi.h b/windows/third/cef/include/capi/cef_i18n_util_capi.h similarity index 100% rename from windows/include/capi/cef_i18n_util_capi.h rename to windows/third/cef/include/capi/cef_i18n_util_capi.h diff --git a/windows/include/capi/cef_image_capi.h b/windows/third/cef/include/capi/cef_image_capi.h similarity index 100% rename from windows/include/capi/cef_image_capi.h rename to windows/third/cef/include/capi/cef_image_capi.h diff --git a/windows/include/capi/cef_jsdialog_handler_capi.h b/windows/third/cef/include/capi/cef_jsdialog_handler_capi.h similarity index 100% rename from windows/include/capi/cef_jsdialog_handler_capi.h rename to windows/third/cef/include/capi/cef_jsdialog_handler_capi.h diff --git a/windows/include/capi/cef_keyboard_handler_capi.h b/windows/third/cef/include/capi/cef_keyboard_handler_capi.h similarity index 100% rename from windows/include/capi/cef_keyboard_handler_capi.h rename to windows/third/cef/include/capi/cef_keyboard_handler_capi.h diff --git a/windows/include/capi/cef_life_span_handler_capi.h b/windows/third/cef/include/capi/cef_life_span_handler_capi.h similarity index 100% rename from windows/include/capi/cef_life_span_handler_capi.h rename to windows/third/cef/include/capi/cef_life_span_handler_capi.h diff --git a/windows/include/capi/cef_load_handler_capi.h b/windows/third/cef/include/capi/cef_load_handler_capi.h similarity index 100% rename from windows/include/capi/cef_load_handler_capi.h rename to windows/third/cef/include/capi/cef_load_handler_capi.h diff --git a/windows/include/capi/cef_media_router_capi.h b/windows/third/cef/include/capi/cef_media_router_capi.h similarity index 100% rename from windows/include/capi/cef_media_router_capi.h rename to windows/third/cef/include/capi/cef_media_router_capi.h diff --git a/windows/include/capi/cef_menu_model_capi.h b/windows/third/cef/include/capi/cef_menu_model_capi.h similarity index 100% rename from windows/include/capi/cef_menu_model_capi.h rename to windows/third/cef/include/capi/cef_menu_model_capi.h diff --git a/windows/include/capi/cef_menu_model_delegate_capi.h b/windows/third/cef/include/capi/cef_menu_model_delegate_capi.h similarity index 100% rename from windows/include/capi/cef_menu_model_delegate_capi.h rename to windows/third/cef/include/capi/cef_menu_model_delegate_capi.h diff --git a/windows/include/capi/cef_navigation_entry_capi.h b/windows/third/cef/include/capi/cef_navigation_entry_capi.h similarity index 100% rename from windows/include/capi/cef_navigation_entry_capi.h rename to windows/third/cef/include/capi/cef_navigation_entry_capi.h diff --git a/windows/include/capi/cef_origin_whitelist_capi.h b/windows/third/cef/include/capi/cef_origin_whitelist_capi.h similarity index 100% rename from windows/include/capi/cef_origin_whitelist_capi.h rename to windows/third/cef/include/capi/cef_origin_whitelist_capi.h diff --git a/windows/include/capi/cef_parser_capi.h b/windows/third/cef/include/capi/cef_parser_capi.h similarity index 100% rename from windows/include/capi/cef_parser_capi.h rename to windows/third/cef/include/capi/cef_parser_capi.h diff --git a/windows/include/capi/cef_path_util_capi.h b/windows/third/cef/include/capi/cef_path_util_capi.h similarity index 100% rename from windows/include/capi/cef_path_util_capi.h rename to windows/third/cef/include/capi/cef_path_util_capi.h diff --git a/windows/include/capi/cef_print_handler_capi.h b/windows/third/cef/include/capi/cef_print_handler_capi.h similarity index 100% rename from windows/include/capi/cef_print_handler_capi.h rename to windows/third/cef/include/capi/cef_print_handler_capi.h diff --git a/windows/include/capi/cef_print_settings_capi.h b/windows/third/cef/include/capi/cef_print_settings_capi.h similarity index 100% rename from windows/include/capi/cef_print_settings_capi.h rename to windows/third/cef/include/capi/cef_print_settings_capi.h diff --git a/windows/include/capi/cef_process_message_capi.h b/windows/third/cef/include/capi/cef_process_message_capi.h similarity index 100% rename from windows/include/capi/cef_process_message_capi.h rename to windows/third/cef/include/capi/cef_process_message_capi.h diff --git a/windows/include/capi/cef_process_util_capi.h b/windows/third/cef/include/capi/cef_process_util_capi.h similarity index 100% rename from windows/include/capi/cef_process_util_capi.h rename to windows/third/cef/include/capi/cef_process_util_capi.h diff --git a/windows/include/capi/cef_registration_capi.h b/windows/third/cef/include/capi/cef_registration_capi.h similarity index 100% rename from windows/include/capi/cef_registration_capi.h rename to windows/third/cef/include/capi/cef_registration_capi.h diff --git a/windows/include/capi/cef_render_handler_capi.h b/windows/third/cef/include/capi/cef_render_handler_capi.h similarity index 100% rename from windows/include/capi/cef_render_handler_capi.h rename to windows/third/cef/include/capi/cef_render_handler_capi.h diff --git a/windows/include/capi/cef_render_process_handler_capi.h b/windows/third/cef/include/capi/cef_render_process_handler_capi.h similarity index 100% rename from windows/include/capi/cef_render_process_handler_capi.h rename to windows/third/cef/include/capi/cef_render_process_handler_capi.h diff --git a/windows/include/capi/cef_request_capi.h b/windows/third/cef/include/capi/cef_request_capi.h similarity index 100% rename from windows/include/capi/cef_request_capi.h rename to windows/third/cef/include/capi/cef_request_capi.h diff --git a/windows/include/capi/cef_request_context_capi.h b/windows/third/cef/include/capi/cef_request_context_capi.h similarity index 100% rename from windows/include/capi/cef_request_context_capi.h rename to windows/third/cef/include/capi/cef_request_context_capi.h diff --git a/windows/include/capi/cef_request_context_handler_capi.h b/windows/third/cef/include/capi/cef_request_context_handler_capi.h similarity index 100% rename from windows/include/capi/cef_request_context_handler_capi.h rename to windows/third/cef/include/capi/cef_request_context_handler_capi.h diff --git a/windows/include/capi/cef_request_handler_capi.h b/windows/third/cef/include/capi/cef_request_handler_capi.h similarity index 100% rename from windows/include/capi/cef_request_handler_capi.h rename to windows/third/cef/include/capi/cef_request_handler_capi.h diff --git a/windows/include/capi/cef_resource_bundle_capi.h b/windows/third/cef/include/capi/cef_resource_bundle_capi.h similarity index 100% rename from windows/include/capi/cef_resource_bundle_capi.h rename to windows/third/cef/include/capi/cef_resource_bundle_capi.h diff --git a/windows/include/capi/cef_resource_bundle_handler_capi.h b/windows/third/cef/include/capi/cef_resource_bundle_handler_capi.h similarity index 100% rename from windows/include/capi/cef_resource_bundle_handler_capi.h rename to windows/third/cef/include/capi/cef_resource_bundle_handler_capi.h diff --git a/windows/include/capi/cef_resource_handler_capi.h b/windows/third/cef/include/capi/cef_resource_handler_capi.h similarity index 100% rename from windows/include/capi/cef_resource_handler_capi.h rename to windows/third/cef/include/capi/cef_resource_handler_capi.h diff --git a/windows/include/capi/cef_resource_request_handler_capi.h b/windows/third/cef/include/capi/cef_resource_request_handler_capi.h similarity index 100% rename from windows/include/capi/cef_resource_request_handler_capi.h rename to windows/third/cef/include/capi/cef_resource_request_handler_capi.h diff --git a/windows/include/capi/cef_response_capi.h b/windows/third/cef/include/capi/cef_response_capi.h similarity index 100% rename from windows/include/capi/cef_response_capi.h rename to windows/third/cef/include/capi/cef_response_capi.h diff --git a/windows/include/capi/cef_response_filter_capi.h b/windows/third/cef/include/capi/cef_response_filter_capi.h similarity index 100% rename from windows/include/capi/cef_response_filter_capi.h rename to windows/third/cef/include/capi/cef_response_filter_capi.h diff --git a/windows/include/capi/cef_scheme_capi.h b/windows/third/cef/include/capi/cef_scheme_capi.h similarity index 100% rename from windows/include/capi/cef_scheme_capi.h rename to windows/third/cef/include/capi/cef_scheme_capi.h diff --git a/windows/include/capi/cef_server_capi.h b/windows/third/cef/include/capi/cef_server_capi.h similarity index 100% rename from windows/include/capi/cef_server_capi.h rename to windows/third/cef/include/capi/cef_server_capi.h diff --git a/windows/include/capi/cef_ssl_info_capi.h b/windows/third/cef/include/capi/cef_ssl_info_capi.h similarity index 100% rename from windows/include/capi/cef_ssl_info_capi.h rename to windows/third/cef/include/capi/cef_ssl_info_capi.h diff --git a/windows/include/capi/cef_ssl_status_capi.h b/windows/third/cef/include/capi/cef_ssl_status_capi.h similarity index 100% rename from windows/include/capi/cef_ssl_status_capi.h rename to windows/third/cef/include/capi/cef_ssl_status_capi.h diff --git a/windows/include/capi/cef_stream_capi.h b/windows/third/cef/include/capi/cef_stream_capi.h similarity index 100% rename from windows/include/capi/cef_stream_capi.h rename to windows/third/cef/include/capi/cef_stream_capi.h diff --git a/windows/include/capi/cef_string_visitor_capi.h b/windows/third/cef/include/capi/cef_string_visitor_capi.h similarity index 100% rename from windows/include/capi/cef_string_visitor_capi.h rename to windows/third/cef/include/capi/cef_string_visitor_capi.h diff --git a/windows/include/capi/cef_task_capi.h b/windows/third/cef/include/capi/cef_task_capi.h similarity index 100% rename from windows/include/capi/cef_task_capi.h rename to windows/third/cef/include/capi/cef_task_capi.h diff --git a/windows/include/capi/cef_thread_capi.h b/windows/third/cef/include/capi/cef_thread_capi.h similarity index 100% rename from windows/include/capi/cef_thread_capi.h rename to windows/third/cef/include/capi/cef_thread_capi.h diff --git a/windows/include/capi/cef_trace_capi.h b/windows/third/cef/include/capi/cef_trace_capi.h similarity index 100% rename from windows/include/capi/cef_trace_capi.h rename to windows/third/cef/include/capi/cef_trace_capi.h diff --git a/windows/include/capi/cef_urlrequest_capi.h b/windows/third/cef/include/capi/cef_urlrequest_capi.h similarity index 100% rename from windows/include/capi/cef_urlrequest_capi.h rename to windows/third/cef/include/capi/cef_urlrequest_capi.h diff --git a/windows/include/capi/cef_v8_capi.h b/windows/third/cef/include/capi/cef_v8_capi.h similarity index 100% rename from windows/include/capi/cef_v8_capi.h rename to windows/third/cef/include/capi/cef_v8_capi.h diff --git a/windows/include/capi/cef_values_capi.h b/windows/third/cef/include/capi/cef_values_capi.h similarity index 100% rename from windows/include/capi/cef_values_capi.h rename to windows/third/cef/include/capi/cef_values_capi.h diff --git a/windows/include/capi/cef_waitable_event_capi.h b/windows/third/cef/include/capi/cef_waitable_event_capi.h similarity index 100% rename from windows/include/capi/cef_waitable_event_capi.h rename to windows/third/cef/include/capi/cef_waitable_event_capi.h diff --git a/windows/include/capi/cef_x509_certificate_capi.h b/windows/third/cef/include/capi/cef_x509_certificate_capi.h similarity index 100% rename from windows/include/capi/cef_x509_certificate_capi.h rename to windows/third/cef/include/capi/cef_x509_certificate_capi.h diff --git a/windows/include/capi/cef_xml_reader_capi.h b/windows/third/cef/include/capi/cef_xml_reader_capi.h similarity index 100% rename from windows/include/capi/cef_xml_reader_capi.h rename to windows/third/cef/include/capi/cef_xml_reader_capi.h diff --git a/windows/include/capi/cef_zip_reader_capi.h b/windows/third/cef/include/capi/cef_zip_reader_capi.h similarity index 100% rename from windows/include/capi/cef_zip_reader_capi.h rename to windows/third/cef/include/capi/cef_zip_reader_capi.h diff --git a/windows/include/capi/test/cef_test_helpers_capi.h b/windows/third/cef/include/capi/test/cef_test_helpers_capi.h similarity index 100% rename from windows/include/capi/test/cef_test_helpers_capi.h rename to windows/third/cef/include/capi/test/cef_test_helpers_capi.h diff --git a/windows/include/capi/test/cef_translator_test_capi.h b/windows/third/cef/include/capi/test/cef_translator_test_capi.h similarity index 100% rename from windows/include/capi/test/cef_translator_test_capi.h rename to windows/third/cef/include/capi/test/cef_translator_test_capi.h diff --git a/windows/include/capi/views/cef_box_layout_capi.h b/windows/third/cef/include/capi/views/cef_box_layout_capi.h similarity index 100% rename from windows/include/capi/views/cef_box_layout_capi.h rename to windows/third/cef/include/capi/views/cef_box_layout_capi.h diff --git a/windows/include/capi/views/cef_browser_view_capi.h b/windows/third/cef/include/capi/views/cef_browser_view_capi.h similarity index 100% rename from windows/include/capi/views/cef_browser_view_capi.h rename to windows/third/cef/include/capi/views/cef_browser_view_capi.h diff --git a/windows/include/capi/views/cef_browser_view_delegate_capi.h b/windows/third/cef/include/capi/views/cef_browser_view_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_browser_view_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_browser_view_delegate_capi.h diff --git a/windows/include/capi/views/cef_button_capi.h b/windows/third/cef/include/capi/views/cef_button_capi.h similarity index 100% rename from windows/include/capi/views/cef_button_capi.h rename to windows/third/cef/include/capi/views/cef_button_capi.h diff --git a/windows/include/capi/views/cef_button_delegate_capi.h b/windows/third/cef/include/capi/views/cef_button_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_button_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_button_delegate_capi.h diff --git a/windows/include/capi/views/cef_display_capi.h b/windows/third/cef/include/capi/views/cef_display_capi.h similarity index 100% rename from windows/include/capi/views/cef_display_capi.h rename to windows/third/cef/include/capi/views/cef_display_capi.h diff --git a/windows/include/capi/views/cef_fill_layout_capi.h b/windows/third/cef/include/capi/views/cef_fill_layout_capi.h similarity index 100% rename from windows/include/capi/views/cef_fill_layout_capi.h rename to windows/third/cef/include/capi/views/cef_fill_layout_capi.h diff --git a/windows/include/capi/views/cef_label_button_capi.h b/windows/third/cef/include/capi/views/cef_label_button_capi.h similarity index 100% rename from windows/include/capi/views/cef_label_button_capi.h rename to windows/third/cef/include/capi/views/cef_label_button_capi.h diff --git a/windows/include/capi/views/cef_layout_capi.h b/windows/third/cef/include/capi/views/cef_layout_capi.h similarity index 100% rename from windows/include/capi/views/cef_layout_capi.h rename to windows/third/cef/include/capi/views/cef_layout_capi.h diff --git a/windows/include/capi/views/cef_menu_button_capi.h b/windows/third/cef/include/capi/views/cef_menu_button_capi.h similarity index 100% rename from windows/include/capi/views/cef_menu_button_capi.h rename to windows/third/cef/include/capi/views/cef_menu_button_capi.h diff --git a/windows/include/capi/views/cef_menu_button_delegate_capi.h b/windows/third/cef/include/capi/views/cef_menu_button_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_menu_button_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_menu_button_delegate_capi.h diff --git a/windows/include/capi/views/cef_overlay_controller_capi.h b/windows/third/cef/include/capi/views/cef_overlay_controller_capi.h similarity index 100% rename from windows/include/capi/views/cef_overlay_controller_capi.h rename to windows/third/cef/include/capi/views/cef_overlay_controller_capi.h diff --git a/windows/include/capi/views/cef_panel_capi.h b/windows/third/cef/include/capi/views/cef_panel_capi.h similarity index 100% rename from windows/include/capi/views/cef_panel_capi.h rename to windows/third/cef/include/capi/views/cef_panel_capi.h diff --git a/windows/include/capi/views/cef_panel_delegate_capi.h b/windows/third/cef/include/capi/views/cef_panel_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_panel_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_panel_delegate_capi.h diff --git a/windows/include/capi/views/cef_scroll_view_capi.h b/windows/third/cef/include/capi/views/cef_scroll_view_capi.h similarity index 100% rename from windows/include/capi/views/cef_scroll_view_capi.h rename to windows/third/cef/include/capi/views/cef_scroll_view_capi.h diff --git a/windows/include/capi/views/cef_textfield_capi.h b/windows/third/cef/include/capi/views/cef_textfield_capi.h similarity index 100% rename from windows/include/capi/views/cef_textfield_capi.h rename to windows/third/cef/include/capi/views/cef_textfield_capi.h diff --git a/windows/include/capi/views/cef_textfield_delegate_capi.h b/windows/third/cef/include/capi/views/cef_textfield_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_textfield_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_textfield_delegate_capi.h diff --git a/windows/include/capi/views/cef_view_capi.h b/windows/third/cef/include/capi/views/cef_view_capi.h similarity index 100% rename from windows/include/capi/views/cef_view_capi.h rename to windows/third/cef/include/capi/views/cef_view_capi.h diff --git a/windows/include/capi/views/cef_view_delegate_capi.h b/windows/third/cef/include/capi/views/cef_view_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_view_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_view_delegate_capi.h diff --git a/windows/include/capi/views/cef_window_capi.h b/windows/third/cef/include/capi/views/cef_window_capi.h similarity index 100% rename from windows/include/capi/views/cef_window_capi.h rename to windows/third/cef/include/capi/views/cef_window_capi.h diff --git a/windows/include/capi/views/cef_window_delegate_capi.h b/windows/third/cef/include/capi/views/cef_window_delegate_capi.h similarity index 100% rename from windows/include/capi/views/cef_window_delegate_capi.h rename to windows/third/cef/include/capi/views/cef_window_delegate_capi.h diff --git a/windows/include/cef_accessibility_handler.h b/windows/third/cef/include/cef_accessibility_handler.h similarity index 100% rename from windows/include/cef_accessibility_handler.h rename to windows/third/cef/include/cef_accessibility_handler.h diff --git a/windows/include/cef_api_hash.h b/windows/third/cef/include/cef_api_hash.h similarity index 100% rename from windows/include/cef_api_hash.h rename to windows/third/cef/include/cef_api_hash.h diff --git a/windows/include/cef_app.h b/windows/third/cef/include/cef_app.h similarity index 100% rename from windows/include/cef_app.h rename to windows/third/cef/include/cef_app.h diff --git a/windows/include/cef_audio_handler.h b/windows/third/cef/include/cef_audio_handler.h similarity index 100% rename from windows/include/cef_audio_handler.h rename to windows/third/cef/include/cef_audio_handler.h diff --git a/windows/include/cef_auth_callback.h b/windows/third/cef/include/cef_auth_callback.h similarity index 100% rename from windows/include/cef_auth_callback.h rename to windows/third/cef/include/cef_auth_callback.h diff --git a/windows/include/cef_base.h b/windows/third/cef/include/cef_base.h similarity index 100% rename from windows/include/cef_base.h rename to windows/third/cef/include/cef_base.h diff --git a/windows/include/cef_browser.h b/windows/third/cef/include/cef_browser.h similarity index 100% rename from windows/include/cef_browser.h rename to windows/third/cef/include/cef_browser.h diff --git a/windows/include/cef_browser_process_handler.h b/windows/third/cef/include/cef_browser_process_handler.h similarity index 100% rename from windows/include/cef_browser_process_handler.h rename to windows/third/cef/include/cef_browser_process_handler.h diff --git a/windows/include/cef_callback.h b/windows/third/cef/include/cef_callback.h similarity index 100% rename from windows/include/cef_callback.h rename to windows/third/cef/include/cef_callback.h diff --git a/windows/include/cef_client.h b/windows/third/cef/include/cef_client.h similarity index 100% rename from windows/include/cef_client.h rename to windows/third/cef/include/cef_client.h diff --git a/windows/include/cef_command_handler.h b/windows/third/cef/include/cef_command_handler.h similarity index 100% rename from windows/include/cef_command_handler.h rename to windows/third/cef/include/cef_command_handler.h diff --git a/windows/include/cef_command_ids.h b/windows/third/cef/include/cef_command_ids.h similarity index 100% rename from windows/include/cef_command_ids.h rename to windows/third/cef/include/cef_command_ids.h diff --git a/windows/include/cef_command_line.h b/windows/third/cef/include/cef_command_line.h similarity index 100% rename from windows/include/cef_command_line.h rename to windows/third/cef/include/cef_command_line.h diff --git a/windows/include/cef_config.h b/windows/third/cef/include/cef_config.h similarity index 100% rename from windows/include/cef_config.h rename to windows/third/cef/include/cef_config.h diff --git a/windows/include/cef_context_menu_handler.h b/windows/third/cef/include/cef_context_menu_handler.h similarity index 100% rename from windows/include/cef_context_menu_handler.h rename to windows/third/cef/include/cef_context_menu_handler.h diff --git a/windows/include/cef_cookie.h b/windows/third/cef/include/cef_cookie.h similarity index 100% rename from windows/include/cef_cookie.h rename to windows/third/cef/include/cef_cookie.h diff --git a/windows/include/cef_crash_util.h b/windows/third/cef/include/cef_crash_util.h similarity index 100% rename from windows/include/cef_crash_util.h rename to windows/third/cef/include/cef_crash_util.h diff --git a/windows/include/cef_devtools_message_observer.h b/windows/third/cef/include/cef_devtools_message_observer.h similarity index 100% rename from windows/include/cef_devtools_message_observer.h rename to windows/third/cef/include/cef_devtools_message_observer.h diff --git a/windows/include/cef_dialog_handler.h b/windows/third/cef/include/cef_dialog_handler.h similarity index 100% rename from windows/include/cef_dialog_handler.h rename to windows/third/cef/include/cef_dialog_handler.h diff --git a/windows/include/cef_display_handler.h b/windows/third/cef/include/cef_display_handler.h similarity index 100% rename from windows/include/cef_display_handler.h rename to windows/third/cef/include/cef_display_handler.h diff --git a/windows/include/cef_dom.h b/windows/third/cef/include/cef_dom.h similarity index 100% rename from windows/include/cef_dom.h rename to windows/third/cef/include/cef_dom.h diff --git a/windows/include/cef_download_handler.h b/windows/third/cef/include/cef_download_handler.h similarity index 100% rename from windows/include/cef_download_handler.h rename to windows/third/cef/include/cef_download_handler.h diff --git a/windows/include/cef_download_item.h b/windows/third/cef/include/cef_download_item.h similarity index 100% rename from windows/include/cef_download_item.h rename to windows/third/cef/include/cef_download_item.h diff --git a/windows/include/cef_drag_data.h b/windows/third/cef/include/cef_drag_data.h similarity index 100% rename from windows/include/cef_drag_data.h rename to windows/third/cef/include/cef_drag_data.h diff --git a/windows/include/cef_drag_handler.h b/windows/third/cef/include/cef_drag_handler.h similarity index 100% rename from windows/include/cef_drag_handler.h rename to windows/third/cef/include/cef_drag_handler.h diff --git a/windows/include/cef_extension.h b/windows/third/cef/include/cef_extension.h similarity index 100% rename from windows/include/cef_extension.h rename to windows/third/cef/include/cef_extension.h diff --git a/windows/include/cef_extension_handler.h b/windows/third/cef/include/cef_extension_handler.h similarity index 100% rename from windows/include/cef_extension_handler.h rename to windows/third/cef/include/cef_extension_handler.h diff --git a/windows/include/cef_file_util.h b/windows/third/cef/include/cef_file_util.h similarity index 100% rename from windows/include/cef_file_util.h rename to windows/third/cef/include/cef_file_util.h diff --git a/windows/include/cef_find_handler.h b/windows/third/cef/include/cef_find_handler.h similarity index 100% rename from windows/include/cef_find_handler.h rename to windows/third/cef/include/cef_find_handler.h diff --git a/windows/include/cef_focus_handler.h b/windows/third/cef/include/cef_focus_handler.h similarity index 100% rename from windows/include/cef_focus_handler.h rename to windows/third/cef/include/cef_focus_handler.h diff --git a/windows/include/cef_frame.h b/windows/third/cef/include/cef_frame.h similarity index 100% rename from windows/include/cef_frame.h rename to windows/third/cef/include/cef_frame.h diff --git a/windows/include/cef_frame_handler.h b/windows/third/cef/include/cef_frame_handler.h similarity index 100% rename from windows/include/cef_frame_handler.h rename to windows/third/cef/include/cef_frame_handler.h diff --git a/windows/include/cef_i18n_util.h b/windows/third/cef/include/cef_i18n_util.h similarity index 100% rename from windows/include/cef_i18n_util.h rename to windows/third/cef/include/cef_i18n_util.h diff --git a/windows/include/cef_image.h b/windows/third/cef/include/cef_image.h similarity index 100% rename from windows/include/cef_image.h rename to windows/third/cef/include/cef_image.h diff --git a/windows/include/cef_jsdialog_handler.h b/windows/third/cef/include/cef_jsdialog_handler.h similarity index 100% rename from windows/include/cef_jsdialog_handler.h rename to windows/third/cef/include/cef_jsdialog_handler.h diff --git a/windows/include/cef_keyboard_handler.h b/windows/third/cef/include/cef_keyboard_handler.h similarity index 100% rename from windows/include/cef_keyboard_handler.h rename to windows/third/cef/include/cef_keyboard_handler.h diff --git a/windows/include/cef_life_span_handler.h b/windows/third/cef/include/cef_life_span_handler.h similarity index 100% rename from windows/include/cef_life_span_handler.h rename to windows/third/cef/include/cef_life_span_handler.h diff --git a/windows/include/cef_load_handler.h b/windows/third/cef/include/cef_load_handler.h similarity index 100% rename from windows/include/cef_load_handler.h rename to windows/third/cef/include/cef_load_handler.h diff --git a/windows/include/cef_media_router.h b/windows/third/cef/include/cef_media_router.h similarity index 100% rename from windows/include/cef_media_router.h rename to windows/third/cef/include/cef_media_router.h diff --git a/windows/include/cef_menu_model.h b/windows/third/cef/include/cef_menu_model.h similarity index 100% rename from windows/include/cef_menu_model.h rename to windows/third/cef/include/cef_menu_model.h diff --git a/windows/include/cef_menu_model_delegate.h b/windows/third/cef/include/cef_menu_model_delegate.h similarity index 100% rename from windows/include/cef_menu_model_delegate.h rename to windows/third/cef/include/cef_menu_model_delegate.h diff --git a/windows/include/cef_navigation_entry.h b/windows/third/cef/include/cef_navigation_entry.h similarity index 100% rename from windows/include/cef_navigation_entry.h rename to windows/third/cef/include/cef_navigation_entry.h diff --git a/windows/include/cef_origin_whitelist.h b/windows/third/cef/include/cef_origin_whitelist.h similarity index 100% rename from windows/include/cef_origin_whitelist.h rename to windows/third/cef/include/cef_origin_whitelist.h diff --git a/windows/include/cef_pack_resources.h b/windows/third/cef/include/cef_pack_resources.h similarity index 100% rename from windows/include/cef_pack_resources.h rename to windows/third/cef/include/cef_pack_resources.h diff --git a/windows/include/cef_pack_strings.h b/windows/third/cef/include/cef_pack_strings.h similarity index 100% rename from windows/include/cef_pack_strings.h rename to windows/third/cef/include/cef_pack_strings.h diff --git a/windows/include/cef_parser.h b/windows/third/cef/include/cef_parser.h similarity index 100% rename from windows/include/cef_parser.h rename to windows/third/cef/include/cef_parser.h diff --git a/windows/include/cef_path_util.h b/windows/third/cef/include/cef_path_util.h similarity index 100% rename from windows/include/cef_path_util.h rename to windows/third/cef/include/cef_path_util.h diff --git a/windows/include/cef_print_handler.h b/windows/third/cef/include/cef_print_handler.h similarity index 100% rename from windows/include/cef_print_handler.h rename to windows/third/cef/include/cef_print_handler.h diff --git a/windows/include/cef_print_settings.h b/windows/third/cef/include/cef_print_settings.h similarity index 100% rename from windows/include/cef_print_settings.h rename to windows/third/cef/include/cef_print_settings.h diff --git a/windows/include/cef_process_message.h b/windows/third/cef/include/cef_process_message.h similarity index 100% rename from windows/include/cef_process_message.h rename to windows/third/cef/include/cef_process_message.h diff --git a/windows/include/cef_process_util.h b/windows/third/cef/include/cef_process_util.h similarity index 100% rename from windows/include/cef_process_util.h rename to windows/third/cef/include/cef_process_util.h diff --git a/windows/include/cef_registration.h b/windows/third/cef/include/cef_registration.h similarity index 100% rename from windows/include/cef_registration.h rename to windows/third/cef/include/cef_registration.h diff --git a/windows/include/cef_render_handler.h b/windows/third/cef/include/cef_render_handler.h similarity index 100% rename from windows/include/cef_render_handler.h rename to windows/third/cef/include/cef_render_handler.h diff --git a/windows/include/cef_render_process_handler.h b/windows/third/cef/include/cef_render_process_handler.h similarity index 100% rename from windows/include/cef_render_process_handler.h rename to windows/third/cef/include/cef_render_process_handler.h diff --git a/windows/include/cef_request.h b/windows/third/cef/include/cef_request.h similarity index 100% rename from windows/include/cef_request.h rename to windows/third/cef/include/cef_request.h diff --git a/windows/include/cef_request_context.h b/windows/third/cef/include/cef_request_context.h similarity index 100% rename from windows/include/cef_request_context.h rename to windows/third/cef/include/cef_request_context.h diff --git a/windows/include/cef_request_context_handler.h b/windows/third/cef/include/cef_request_context_handler.h similarity index 100% rename from windows/include/cef_request_context_handler.h rename to windows/third/cef/include/cef_request_context_handler.h diff --git a/windows/include/cef_request_handler.h b/windows/third/cef/include/cef_request_handler.h similarity index 100% rename from windows/include/cef_request_handler.h rename to windows/third/cef/include/cef_request_handler.h diff --git a/windows/include/cef_resource_bundle.h b/windows/third/cef/include/cef_resource_bundle.h similarity index 100% rename from windows/include/cef_resource_bundle.h rename to windows/third/cef/include/cef_resource_bundle.h diff --git a/windows/include/cef_resource_bundle_handler.h b/windows/third/cef/include/cef_resource_bundle_handler.h similarity index 100% rename from windows/include/cef_resource_bundle_handler.h rename to windows/third/cef/include/cef_resource_bundle_handler.h diff --git a/windows/include/cef_resource_handler.h b/windows/third/cef/include/cef_resource_handler.h similarity index 100% rename from windows/include/cef_resource_handler.h rename to windows/third/cef/include/cef_resource_handler.h diff --git a/windows/include/cef_resource_request_handler.h b/windows/third/cef/include/cef_resource_request_handler.h similarity index 100% rename from windows/include/cef_resource_request_handler.h rename to windows/third/cef/include/cef_resource_request_handler.h diff --git a/windows/include/cef_response.h b/windows/third/cef/include/cef_response.h similarity index 100% rename from windows/include/cef_response.h rename to windows/third/cef/include/cef_response.h diff --git a/windows/include/cef_response_filter.h b/windows/third/cef/include/cef_response_filter.h similarity index 100% rename from windows/include/cef_response_filter.h rename to windows/third/cef/include/cef_response_filter.h diff --git a/windows/include/cef_sandbox_win.h b/windows/third/cef/include/cef_sandbox_win.h similarity index 100% rename from windows/include/cef_sandbox_win.h rename to windows/third/cef/include/cef_sandbox_win.h diff --git a/windows/include/cef_scheme.h b/windows/third/cef/include/cef_scheme.h similarity index 100% rename from windows/include/cef_scheme.h rename to windows/third/cef/include/cef_scheme.h diff --git a/windows/include/cef_server.h b/windows/third/cef/include/cef_server.h similarity index 100% rename from windows/include/cef_server.h rename to windows/third/cef/include/cef_server.h diff --git a/windows/include/cef_ssl_info.h b/windows/third/cef/include/cef_ssl_info.h similarity index 100% rename from windows/include/cef_ssl_info.h rename to windows/third/cef/include/cef_ssl_info.h diff --git a/windows/include/cef_ssl_status.h b/windows/third/cef/include/cef_ssl_status.h similarity index 100% rename from windows/include/cef_ssl_status.h rename to windows/third/cef/include/cef_ssl_status.h diff --git a/windows/include/cef_stream.h b/windows/third/cef/include/cef_stream.h similarity index 100% rename from windows/include/cef_stream.h rename to windows/third/cef/include/cef_stream.h diff --git a/windows/include/cef_string_visitor.h b/windows/third/cef/include/cef_string_visitor.h similarity index 100% rename from windows/include/cef_string_visitor.h rename to windows/third/cef/include/cef_string_visitor.h diff --git a/windows/include/cef_task.h b/windows/third/cef/include/cef_task.h similarity index 100% rename from windows/include/cef_task.h rename to windows/third/cef/include/cef_task.h diff --git a/windows/include/cef_thread.h b/windows/third/cef/include/cef_thread.h similarity index 100% rename from windows/include/cef_thread.h rename to windows/third/cef/include/cef_thread.h diff --git a/windows/include/cef_trace.h b/windows/third/cef/include/cef_trace.h similarity index 100% rename from windows/include/cef_trace.h rename to windows/third/cef/include/cef_trace.h diff --git a/windows/include/cef_urlrequest.h b/windows/third/cef/include/cef_urlrequest.h similarity index 100% rename from windows/include/cef_urlrequest.h rename to windows/third/cef/include/cef_urlrequest.h diff --git a/windows/include/cef_v8.h b/windows/third/cef/include/cef_v8.h similarity index 100% rename from windows/include/cef_v8.h rename to windows/third/cef/include/cef_v8.h diff --git a/windows/include/cef_values.h b/windows/third/cef/include/cef_values.h similarity index 100% rename from windows/include/cef_values.h rename to windows/third/cef/include/cef_values.h diff --git a/windows/include/cef_version.h b/windows/third/cef/include/cef_version.h similarity index 100% rename from windows/include/cef_version.h rename to windows/third/cef/include/cef_version.h diff --git a/windows/include/cef_waitable_event.h b/windows/third/cef/include/cef_waitable_event.h similarity index 100% rename from windows/include/cef_waitable_event.h rename to windows/third/cef/include/cef_waitable_event.h diff --git a/windows/include/cef_x509_certificate.h b/windows/third/cef/include/cef_x509_certificate.h similarity index 100% rename from windows/include/cef_x509_certificate.h rename to windows/third/cef/include/cef_x509_certificate.h diff --git a/windows/include/cef_xml_reader.h b/windows/third/cef/include/cef_xml_reader.h similarity index 100% rename from windows/include/cef_xml_reader.h rename to windows/third/cef/include/cef_xml_reader.h diff --git a/windows/include/cef_zip_reader.h b/windows/third/cef/include/cef_zip_reader.h similarity index 100% rename from windows/include/cef_zip_reader.h rename to windows/third/cef/include/cef_zip_reader.h diff --git a/windows/include/internal/cef_export.h b/windows/third/cef/include/internal/cef_export.h similarity index 100% rename from windows/include/internal/cef_export.h rename to windows/third/cef/include/internal/cef_export.h diff --git a/windows/include/internal/cef_logging_internal.h b/windows/third/cef/include/internal/cef_logging_internal.h similarity index 100% rename from windows/include/internal/cef_logging_internal.h rename to windows/third/cef/include/internal/cef_logging_internal.h diff --git a/windows/include/internal/cef_ptr.h b/windows/third/cef/include/internal/cef_ptr.h similarity index 100% rename from windows/include/internal/cef_ptr.h rename to windows/third/cef/include/internal/cef_ptr.h diff --git a/windows/include/internal/cef_string.h b/windows/third/cef/include/internal/cef_string.h similarity index 100% rename from windows/include/internal/cef_string.h rename to windows/third/cef/include/internal/cef_string.h diff --git a/windows/include/internal/cef_string_list.h b/windows/third/cef/include/internal/cef_string_list.h similarity index 100% rename from windows/include/internal/cef_string_list.h rename to windows/third/cef/include/internal/cef_string_list.h diff --git a/windows/include/internal/cef_string_map.h b/windows/third/cef/include/internal/cef_string_map.h similarity index 100% rename from windows/include/internal/cef_string_map.h rename to windows/third/cef/include/internal/cef_string_map.h diff --git a/windows/include/internal/cef_string_multimap.h b/windows/third/cef/include/internal/cef_string_multimap.h similarity index 100% rename from windows/include/internal/cef_string_multimap.h rename to windows/third/cef/include/internal/cef_string_multimap.h diff --git a/windows/include/internal/cef_string_types.h b/windows/third/cef/include/internal/cef_string_types.h similarity index 100% rename from windows/include/internal/cef_string_types.h rename to windows/third/cef/include/internal/cef_string_types.h diff --git a/windows/include/internal/cef_string_wrappers.h b/windows/third/cef/include/internal/cef_string_wrappers.h similarity index 100% rename from windows/include/internal/cef_string_wrappers.h rename to windows/third/cef/include/internal/cef_string_wrappers.h diff --git a/windows/include/internal/cef_thread_internal.h b/windows/third/cef/include/internal/cef_thread_internal.h similarity index 100% rename from windows/include/internal/cef_thread_internal.h rename to windows/third/cef/include/internal/cef_thread_internal.h diff --git a/windows/include/internal/cef_time.h b/windows/third/cef/include/internal/cef_time.h similarity index 100% rename from windows/include/internal/cef_time.h rename to windows/third/cef/include/internal/cef_time.h diff --git a/windows/include/internal/cef_trace_event_internal.h b/windows/third/cef/include/internal/cef_trace_event_internal.h similarity index 100% rename from windows/include/internal/cef_trace_event_internal.h rename to windows/third/cef/include/internal/cef_trace_event_internal.h diff --git a/windows/include/internal/cef_types.h b/windows/third/cef/include/internal/cef_types.h similarity index 100% rename from windows/include/internal/cef_types.h rename to windows/third/cef/include/internal/cef_types.h diff --git a/windows/include/internal/cef_types_geometry.h b/windows/third/cef/include/internal/cef_types_geometry.h similarity index 100% rename from windows/include/internal/cef_types_geometry.h rename to windows/third/cef/include/internal/cef_types_geometry.h diff --git a/windows/include/internal/cef_types_win.h b/windows/third/cef/include/internal/cef_types_win.h similarity index 100% rename from windows/include/internal/cef_types_win.h rename to windows/third/cef/include/internal/cef_types_win.h diff --git a/windows/include/internal/cef_types_wrappers.h b/windows/third/cef/include/internal/cef_types_wrappers.h similarity index 100% rename from windows/include/internal/cef_types_wrappers.h rename to windows/third/cef/include/internal/cef_types_wrappers.h diff --git a/windows/include/internal/cef_win.h b/windows/third/cef/include/internal/cef_win.h similarity index 100% rename from windows/include/internal/cef_win.h rename to windows/third/cef/include/internal/cef_win.h diff --git a/windows/include/test/cef_test_helpers.h b/windows/third/cef/include/test/cef_test_helpers.h similarity index 100% rename from windows/include/test/cef_test_helpers.h rename to windows/third/cef/include/test/cef_test_helpers.h diff --git a/windows/include/test/cef_translator_test.h b/windows/third/cef/include/test/cef_translator_test.h similarity index 100% rename from windows/include/test/cef_translator_test.h rename to windows/third/cef/include/test/cef_translator_test.h diff --git a/windows/include/views/cef_box_layout.h b/windows/third/cef/include/views/cef_box_layout.h similarity index 100% rename from windows/include/views/cef_box_layout.h rename to windows/third/cef/include/views/cef_box_layout.h diff --git a/windows/include/views/cef_browser_view.h b/windows/third/cef/include/views/cef_browser_view.h similarity index 100% rename from windows/include/views/cef_browser_view.h rename to windows/third/cef/include/views/cef_browser_view.h diff --git a/windows/include/views/cef_browser_view_delegate.h b/windows/third/cef/include/views/cef_browser_view_delegate.h similarity index 100% rename from windows/include/views/cef_browser_view_delegate.h rename to windows/third/cef/include/views/cef_browser_view_delegate.h diff --git a/windows/include/views/cef_button.h b/windows/third/cef/include/views/cef_button.h similarity index 100% rename from windows/include/views/cef_button.h rename to windows/third/cef/include/views/cef_button.h diff --git a/windows/include/views/cef_button_delegate.h b/windows/third/cef/include/views/cef_button_delegate.h similarity index 100% rename from windows/include/views/cef_button_delegate.h rename to windows/third/cef/include/views/cef_button_delegate.h diff --git a/windows/include/views/cef_display.h b/windows/third/cef/include/views/cef_display.h similarity index 100% rename from windows/include/views/cef_display.h rename to windows/third/cef/include/views/cef_display.h diff --git a/windows/include/views/cef_fill_layout.h b/windows/third/cef/include/views/cef_fill_layout.h similarity index 100% rename from windows/include/views/cef_fill_layout.h rename to windows/third/cef/include/views/cef_fill_layout.h diff --git a/windows/include/views/cef_label_button.h b/windows/third/cef/include/views/cef_label_button.h similarity index 100% rename from windows/include/views/cef_label_button.h rename to windows/third/cef/include/views/cef_label_button.h diff --git a/windows/include/views/cef_layout.h b/windows/third/cef/include/views/cef_layout.h similarity index 100% rename from windows/include/views/cef_layout.h rename to windows/third/cef/include/views/cef_layout.h diff --git a/windows/include/views/cef_menu_button.h b/windows/third/cef/include/views/cef_menu_button.h similarity index 100% rename from windows/include/views/cef_menu_button.h rename to windows/third/cef/include/views/cef_menu_button.h diff --git a/windows/include/views/cef_menu_button_delegate.h b/windows/third/cef/include/views/cef_menu_button_delegate.h similarity index 100% rename from windows/include/views/cef_menu_button_delegate.h rename to windows/third/cef/include/views/cef_menu_button_delegate.h diff --git a/windows/include/views/cef_overlay_controller.h b/windows/third/cef/include/views/cef_overlay_controller.h similarity index 100% rename from windows/include/views/cef_overlay_controller.h rename to windows/third/cef/include/views/cef_overlay_controller.h diff --git a/windows/include/views/cef_panel.h b/windows/third/cef/include/views/cef_panel.h similarity index 100% rename from windows/include/views/cef_panel.h rename to windows/third/cef/include/views/cef_panel.h diff --git a/windows/include/views/cef_panel_delegate.h b/windows/third/cef/include/views/cef_panel_delegate.h similarity index 100% rename from windows/include/views/cef_panel_delegate.h rename to windows/third/cef/include/views/cef_panel_delegate.h diff --git a/windows/include/views/cef_scroll_view.h b/windows/third/cef/include/views/cef_scroll_view.h similarity index 100% rename from windows/include/views/cef_scroll_view.h rename to windows/third/cef/include/views/cef_scroll_view.h diff --git a/windows/include/views/cef_textfield.h b/windows/third/cef/include/views/cef_textfield.h similarity index 100% rename from windows/include/views/cef_textfield.h rename to windows/third/cef/include/views/cef_textfield.h diff --git a/windows/include/views/cef_textfield_delegate.h b/windows/third/cef/include/views/cef_textfield_delegate.h similarity index 100% rename from windows/include/views/cef_textfield_delegate.h rename to windows/third/cef/include/views/cef_textfield_delegate.h diff --git a/windows/include/views/cef_view.h b/windows/third/cef/include/views/cef_view.h similarity index 100% rename from windows/include/views/cef_view.h rename to windows/third/cef/include/views/cef_view.h diff --git a/windows/include/views/cef_view_delegate.h b/windows/third/cef/include/views/cef_view_delegate.h similarity index 100% rename from windows/include/views/cef_view_delegate.h rename to windows/third/cef/include/views/cef_view_delegate.h diff --git a/windows/include/views/cef_window.h b/windows/third/cef/include/views/cef_window.h similarity index 100% rename from windows/include/views/cef_window.h rename to windows/third/cef/include/views/cef_window.h diff --git a/windows/include/views/cef_window_delegate.h b/windows/third/cef/include/views/cef_window_delegate.h similarity index 100% rename from windows/include/views/cef_window_delegate.h rename to windows/third/cef/include/views/cef_window_delegate.h diff --git a/windows/include/wrapper/cef_byte_read_handler.h b/windows/third/cef/include/wrapper/cef_byte_read_handler.h similarity index 100% rename from windows/include/wrapper/cef_byte_read_handler.h rename to windows/third/cef/include/wrapper/cef_byte_read_handler.h diff --git a/windows/include/wrapper/cef_closure_task.h b/windows/third/cef/include/wrapper/cef_closure_task.h similarity index 100% rename from windows/include/wrapper/cef_closure_task.h rename to windows/third/cef/include/wrapper/cef_closure_task.h diff --git a/windows/include/wrapper/cef_helpers.h b/windows/third/cef/include/wrapper/cef_helpers.h similarity index 100% rename from windows/include/wrapper/cef_helpers.h rename to windows/third/cef/include/wrapper/cef_helpers.h diff --git a/windows/include/wrapper/cef_message_router.h b/windows/third/cef/include/wrapper/cef_message_router.h similarity index 100% rename from windows/include/wrapper/cef_message_router.h rename to windows/third/cef/include/wrapper/cef_message_router.h diff --git a/windows/include/wrapper/cef_resource_manager.h b/windows/third/cef/include/wrapper/cef_resource_manager.h similarity index 100% rename from windows/include/wrapper/cef_resource_manager.h rename to windows/third/cef/include/wrapper/cef_resource_manager.h diff --git a/windows/include/wrapper/cef_scoped_temp_dir.h b/windows/third/cef/include/wrapper/cef_scoped_temp_dir.h similarity index 100% rename from windows/include/wrapper/cef_scoped_temp_dir.h rename to windows/third/cef/include/wrapper/cef_scoped_temp_dir.h diff --git a/windows/include/wrapper/cef_stream_resource_handler.h b/windows/third/cef/include/wrapper/cef_stream_resource_handler.h similarity index 100% rename from windows/include/wrapper/cef_stream_resource_handler.h rename to windows/third/cef/include/wrapper/cef_stream_resource_handler.h diff --git a/windows/include/wrapper/cef_xml_object.h b/windows/third/cef/include/wrapper/cef_xml_object.h similarity index 100% rename from windows/include/wrapper/cef_xml_object.h rename to windows/third/cef/include/wrapper/cef_xml_object.h diff --git a/windows/include/wrapper/cef_zip_archive.h b/windows/third/cef/include/wrapper/cef_zip_archive.h similarity index 100% rename from windows/include/wrapper/cef_zip_archive.h rename to windows/third/cef/include/wrapper/cef_zip_archive.h