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 267aeeb8 (#297060).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1863 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-10-10 17:54:35 +00:00
parent aa45672d53
commit 57d47f64b5
20 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libcef/browser/browser_host_impl.cc
View File

@@ -1972,7 +1972,6 @@ void CefBrowserHostImpl::CloseContents(content::WebContents* source) {
}
void CefBrowserHostImpl::UpdateTargetURL(content::WebContents* source,
int32 page_id,
const GURL& url) {
if (client_.get()) {
CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();

1
libcef/browser/browser_host_impl.h
View File

@@ -343,7 +343,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
bool to_different_document) OVERRIDE;
virtual void CloseContents(content::WebContents* source) OVERRIDE;
virtual void UpdateTargetURL(content::WebContents* source,
int32 page_id,
const GURL& url) OVERRIDE;
virtual bool AddMessageToConsole(content::WebContents* source,
int32 level,

7
libcef/browser/render_widget_host_view_osr.cc
View File

@@ -624,6 +624,13 @@ content::BrowserAccessibilityManager*
return NULL;
}
#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
void CefRenderWidgetHostViewOSR::ShowDisambiguationPopup(
const gfx::Rect& rect_pixels,
const SkBitmap& zoomed_bitmap) {
}
#endif
#if !defined(OS_MACOSX) && defined(USE_AURA)
void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged(
const gfx::Range& range,

5
libcef/browser/render_widget_host_view_osr.h
View File

@@ -171,6 +171,11 @@ class CefRenderWidgetHostViewOSR
CreateBrowserAccessibilityManager(
content::BrowserAccessibilityDelegate* delegate) OVERRIDE;
#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
const SkBitmap& zoomed_bitmap) OVERRIDE;
#endif
#if defined(OS_MACOSX)
virtual bool PostProcessEventForPluginIme(
const content::NativeWebKeyboardEvent& event) OVERRIDE;