bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 6e53600d (#386251)

Browse Source 
- Remove |accept_lang| parameter from CefJSDialogHandler::OnJSDialog
  and CefFormatUrlForSecurityDisplay (see https://crbug.com/336973#c36).
- Remove remaining NPAPI-related code including functions from
  cef_web_plugin.h (see https://crbug.com/493212#c55).
- Mac: 10.7+ deployment target is now required for client applications.
- Mac: Remove CefBrowserHost::SetWindowVisibility (issue #1375). No
  replacement is required for windowed rendering. Use WasHidden for
  off-screen rendering.
- Windows: Visual Studio 2015 Update 2 is now required when building
  CEF/Chromium.
This commit is contained in:
Marshall Greenblatt
2016-04-27 16:38:52 -04:00
parent 3c957f9257
commit e7ddc933c9
215 changed files with 869 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/views/view_impl.h
View File

@@ -298,7 +298,6 @@
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "ui/views/background.h"
#include "ui/views/view.h"
@@ -333,7 +332,7 @@ CEF_VIEW_IMPL_T class CefViewImpl : public CefViewAdapter,
views::View* Get() const override {
return root_view();
}
scoped_ptr<views::View> PassOwnership() override {
std::unique_ptr<views::View> PassOwnership() override {
DCHECK(root_view_);
return std::move(root_view_);
}
@@ -354,7 +353,7 @@ CEF_VIEW_IMPL_T class CefViewImpl : public CefViewAdapter,
// Use GetBounds() because some subclasses (like CefWindowImpl) override it.
const CefRect& bounds = GetBounds();
scoped_ptr<base::DictionaryValue> bounds_value(new base::DictionaryValue());
std::unique_ptr<base::DictionaryValue> bounds_value(new base::DictionaryValue());
bounds_value->SetInteger("x", bounds.x);
bounds_value->SetInteger("y", bounds.y);
bounds_value->SetInteger("width", bounds.width);
@@ -438,7 +437,7 @@ CEF_VIEW_IMPL_T class CefViewImpl : public CefViewAdapter,
// Owned reference to the views::View wrapped by this object. Will be nullptr
// before the View is created and after the View's ownership is transferred.
scoped_ptr<ViewsViewClass> root_view_;
std::unique_ptr<ViewsViewClass> root_view_;
// Unowned reference to the views::View wrapped by this object. Will be
// nullptr before the View is created and after the View is destroyed.
@@ -452,7 +451,7 @@ CEF_VIEW_IMPL_T CefString CEF_VIEW_IMPL_D::GetTypeString() {
CEF_VIEW_IMPL_T CefString CEF_VIEW_IMPL_D::ToString(bool include_children) {
CEF_REQUIRE_UIT_RETURN(CefString());
scoped_ptr<base::DictionaryValue> info(new base::DictionaryValue());
std::unique_ptr<base::DictionaryValue> info(new base::DictionaryValue());
if (IsValid())
GetDebugInfo(info.get(), include_children);
else