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

Browse Source 
- Adds support for chrome://view-http-cache/*, chrome://appcache-internals/, chrome://blob-internals/, chrome://tcmalloc/ and chrome://histograms/

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1106 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-02-23 00:43:28 +00:00
parent fd97bbf292
commit 6f922731b4
64 changed files with 574 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/browser/chrome_scheme_handler.cc
View File

@@ -108,7 +108,7 @@ std::string GetCommandLine() {
}
std::string GetModulePath() {
FilePath path;
base::FilePath path;
if (PathService::Get(base::FILE_MODULE, &path))
return CefString(path.value());
return std::string();
@@ -353,7 +353,8 @@ bool IsTraceFrameValid(CefRefPtr<CefFrameHostImpl> frame) {
return true;
}
void LoadTraceFile(CefRefPtr<CefFrameHostImpl> frame, const FilePath& path) {
void LoadTraceFile(CefRefPtr<CefFrameHostImpl> frame,
const base::FilePath& path) {
CEF_REQUIRE_FILET();
if (!IsTraceFrameValid(frame))
@@ -416,7 +417,7 @@ void LoadTraceFile(CefRefPtr<CefFrameHostImpl> frame, const FilePath& path) {
}
void SaveTraceFile(CefRefPtr<CefFrameHostImpl> frame,
const FilePath& path,
const base::FilePath& path,
scoped_ptr<std::string> contents) {
CEF_REQUIRE_FILET();
@@ -527,7 +528,7 @@ void OnChromeTracingProcessMessage(CefRefPtr<CefBrowser> browser,
if (!file_paths.empty()) {
CEF_POST_TASK(CEF_FILET,
base::Bind(LoadTraceFile, frame_,
FilePath(file_paths.front())));
base::FilePath(file_paths.front())));
} else {
frame_->SendJavaScript(
"tracingController.onLoadTraceFileCanceled();",
@@ -565,7 +566,7 @@ void OnChromeTracingProcessMessage(CefRefPtr<CefBrowser> browser,
if (!file_paths.empty()) {
CEF_POST_TASK(CEF_FILET,
base::Bind(SaveTraceFile, frame_,
FilePath(file_paths.front()),
base::FilePath(file_paths.front()),
base::Passed(contents_.Pass())));
} else {
frame_->SendJavaScript(