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 213078.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1338 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-24 20:15:18 +00:00
parent 6a7353be3e
commit a2a3513620
69 changed files with 510 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcef/common/cef_messages.h
View File

@ -6,7 +6,7 @@
// IPC messages for CEF.
// Multiply-included message file, hence no include guard.
#include "base/shared_memory.h"
#include "base/memory/shared_memory.h"
#include "base/values.h"
#include "content/public/common/common_param_traits.h"
#include "content/public/common/referrer.h"

4
libcef/common/drag_data_impl.cc
View File

@ -5,7 +5,7 @@
#include "libcef/common/drag_data_impl.h"
#include "base/files/file_path.h"
CefDragDataImpl::CefDragDataImpl(const WebDropData& data)
CefDragDataImpl::CefDragDataImpl(const content::DropData& data)
: data_(data) {
}
@ -54,7 +54,7 @@ bool CefDragDataImpl::GetFileNames(std::vector<CefString>& names) {
if (data_.filenames.empty())
return false;
std::vector<WebDropData::FileInfo>::const_iterator it =
std::vector<content::DropData::FileInfo>::const_iterator it =
data_.filenames.begin();
for (; it != data_.filenames.end(); ++it)
names.push_back(it->path);

6
libcef/common/drag_data_impl.h
View File

@ -9,12 +9,12 @@
#include <vector>
#include "include/cef_drag_data.h"
#include "webkit/common/webdropdata.h"
#include "content/public/common/drop_data.h"
// Implementation of CefDragData.
class CefDragDataImpl : public CefDragData {
public:
explicit CefDragDataImpl(const WebDropData& data);
explicit CefDragDataImpl(const content::DropData& data);
virtual bool IsLink();
virtual bool IsFragment();
@ -29,7 +29,7 @@ class CefDragDataImpl : public CefDragData {
virtual bool GetFileNames(std::vector<CefString>& names);
protected:
WebDropData data_;
content::DropData data_;
IMPLEMENT_REFCOUNTING(CefDragDataImpl);
};

4
libcef/common/main_delegate.cc
View File

@ -445,14 +445,14 @@ void CefMainDelegate::InitializeResourceBundle() {
content_client_.set_allow_pack_file_load(true);
if (file_util::PathExists(cef_pak_file)) {
if (base::PathExists(cef_pak_file)) {
ResourceBundle::GetSharedInstance().AddDataPackFromPath(
cef_pak_file, ui::SCALE_FACTOR_NONE);
} else {
NOTREACHED() << "Could not load cef.pak";
}
if (file_util::PathExists(devtools_pak_file)) {
if (base::PathExists(devtools_pak_file)) {
ResourceBundle::GetSharedInstance().AddDataPackFromPath(
devtools_pak_file, ui::SCALE_FACTOR_NONE);
}

2
libcef/common/task_runner_impl.cc
View File

@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "content/public/browser/browser_thread.h"

2
libcef/common/time_util.h
View File

@ -7,7 +7,7 @@
#pragma once
#include "include/internal/cef_time.h"
#include "base/time.h"
#include "base/time/time.h"
// Converts cef_time_t to/from a base::Time object.
void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time);

2
libcef/common/url_impl.cc
View File

@ -4,7 +4,7 @@
#include <sstream>
#include "include/cef_url.h"
#include "googleurl/src/gurl.h"
#include "url/gurl.h"
bool CefParseURL(const CefString& url,
CefURLParts& parts) {

2
libcef/common/urlrequest_impl.cc
View File

@ -8,7 +8,7 @@
#include "libcef/renderer/render_urlrequest_impl.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/message_loop/message_loop.h"
#include "content/public/common/content_client.h"
// static