diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-24 17:59:09 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-24 20:32:22 +0200 |
| commit | 38e34792d9b414d666304bf48b96488a7321d999 (patch) | |
| tree | ed40646af7b542fdc8447c91123a9955cf53fe68 /lib/render_widget_host_view_qt.cpp | |
| parent | 0a5caa2c82cd39fecaeb6390423fea4f972a6013 (diff) | |
Cleanup after chromium update.
- Implement recently added pure virtual members:
BrowserContextQt::GetPath() const
BrowserContextQt::RequestMIDISysExPermission(...)
- Remove obsolete function GetSpeechRecognitionPreferences.
- Rename usage of GetActiveURL() to GetVisibleURL().
- Update namespace for usage of type WebPluginGeometry.
- Adjust parameters of RenderWidgetHostViewQt::TextInputChanged.
- Rename RenderWidgetHostViewQt::RenderViewGone to RenderProcessGone
- set_http_server_properties now takes a scoped_ptr.
- Rename WebDropData to content::DropData.
- Rename WebMenuItem to content::MenuItem.
- webkit/support/webkit_support.gyp has been moved to
webkit/webkit_resources.gyp.
Change-Id: I6d5d281b797a8f6197ecb53a08798bd1f6845754
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/render_widget_host_view_qt.cpp')
| -rw-r--r-- | lib/render_widget_host_view_qt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp index f6f15e0ac..276ae9b4d 100644 --- a/lib/render_widget_host_view_qt.cpp +++ b/lib/render_widget_host_view_qt.cpp @@ -271,7 +271,7 @@ void RenderWidgetHostViewQt::WasHidden() m_host->WasHidden(); } -void RenderWidgetHostViewQt::MovePluginWindows(const gfx::Vector2d&, const std::vector<webkit::npapi::WebPluginGeometry>&) +void RenderWidgetHostViewQt::MovePluginWindows(const gfx::Vector2d&, const std::vector<content::WebPluginGeometry>&) { QT_NOT_YET_IMPLEMENTED } @@ -291,7 +291,7 @@ void RenderWidgetHostViewQt::SetIsLoading(bool) // We use WebContentsDelegateQt::LoadingStateChanged to notify about loading state. } -void RenderWidgetHostViewQt::TextInputTypeChanged(ui::TextInputType, bool) +void RenderWidgetHostViewQt::TextInputTypeChanged(ui::TextInputType, bool, ui::TextInputMode) { QT_NOT_YET_IMPLEMENTED } @@ -322,7 +322,7 @@ void RenderWidgetHostViewQt::DidUpdateBackingStore(const gfx::Rect& scroll_rect, } } -void RenderWidgetHostViewQt::RenderViewGone(base::TerminationStatus, int) +void RenderWidgetHostViewQt::RenderProcessGone(base::TerminationStatus, int) { Destroy(); } |