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

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@658 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-31 15:19:33 +00:00
parent dbe75b1326
commit 38f216a9c2
29 changed files with 114 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser/browser_main.cc
View File

@@ -25,13 +25,13 @@
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "net/base/net_module.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
base::StringPiece ResourceProvider(int resource_id) {
return content::GetContentClient()->GetDataResource(resource_id);
return content::GetContentClient()->GetDataResource(resource_id,
ui::SCALE_FACTOR_NONE);
}
} // namespace
@@ -92,9 +92,3 @@ void CefBrowserMainParts::PostMainMessageLoopRun() {
bool CefBrowserMainParts::MainMessageLoopRun(int* result_code) {
return false;
}
ui::Clipboard* CefBrowserMainParts::GetClipboard() {
if (!clipboard_.get())
clipboard_.reset(new ui::Clipboard());
return clipboard_.get();
}