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 2b3ae3b8 (#394939)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-05-24 19:35:43 -04:00
parent 582ce074aa
commit ab2636b012
125 changed files with 619 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libcef/common/main_delegate.cc
View File

@@ -35,6 +35,7 @@
#include "extensions/common/constants.h"
#include "pdf/pdf.h"
#include "ui/base/layout.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
@@ -709,6 +710,9 @@ void CefMainDelegate::InitializeResourceBundle() {
std::string locale = command_line->GetSwitchValueASCII(switches::kLang);
DCHECK(!locale.empty());
// Avoid DCHECK() in ResourceBundle::LoadChromeResources().
ui::MaterialDesignController::Initialize();
const std::string loaded_locale =
ui::ResourceBundle::InitSharedInstanceWithLocale(
locale,

1
libcef/common/main_delegate.h
View File

@@ -12,7 +12,6 @@
#include "include/cef_app.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main_delegate.h"
namespace base {

8
libcef/common/request_impl.cc
View File

@@ -482,7 +482,7 @@ void CefRequestImpl::Get(net::URLRequest* request, bool changed_only) const {
if (ShouldSet(kChangedPostData, changed_only)) {
if (postdata_.get()) {
request->set_upload(make_scoped_ptr(
request->set_upload(base::WrapUnique(
static_cast<CefPostDataImpl*>(postdata_.get())->Get()));
} else if (request->get_upload()) {
request->set_upload(std::unique_ptr<net::UploadDataStream>());
@@ -1025,7 +1025,7 @@ net::UploadDataStream* CefPostDataImpl::Get() const {
UploadElementReaders element_readers;
ElementVector::const_iterator it = elements_.begin();
for (; it != elements_.end(); ++it) {
element_readers.push_back(make_scoped_ptr(
element_readers.push_back(base::WrapUnique(
static_cast<CefPostDataElementImpl*>(it->get())->Get()));
}
@@ -1282,12 +1282,12 @@ net::UploadElementReader* CefPostDataElementImpl::Get() const {
net::UploadElement* element = new net::UploadElement();
element->SetToBytes(static_cast<char*>(data_.bytes.bytes),
data_.bytes.size);
return new BytesElementReader(make_scoped_ptr(element));
return new BytesElementReader(base::WrapUnique(element));
} else if (type_ == PDE_TYPE_FILE) {
net::UploadElement* element = new net::UploadElement();
base::FilePath path = base::FilePath(CefString(&data_.filename));
element->SetToFilePath(path);
return new FileElementReader(make_scoped_ptr(element));
return new FileElementReader(base::WrapUnique(element));
} else {
NOTREACHED();
return NULL;

2
libcef/common/task_runner_impl.cc
View File

@@ -10,7 +10,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/public/browser/browser_thread.h"
using content::BrowserThread;

1
libcef/common/value_base.h
View File

@@ -12,7 +12,6 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/threading/platform_thread.h"