summaryrefslogtreecommitdiffstats
path: root/lib/web_contents_view_qt.h
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-07-24 17:59:09 +0200
committerZeno Albisser <zeno.albisser@digia.com>2013-07-24 20:32:22 +0200
commit38e34792d9b414d666304bf48b96488a7321d999 (patch)
treeed40646af7b542fdc8447c91123a9955cf53fe68 /lib/web_contents_view_qt.h
parent0a5caa2c82cd39fecaeb6390423fea4f972a6013 (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/web_contents_view_qt.h')
-rw-r--r--lib/web_contents_view_qt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h
index 456329201..c7853adda 100644
--- a/lib/web_contents_view_qt.h
+++ b/lib/web_contents_view_qt.h
@@ -107,12 +107,12 @@ public:
virtual void RestoreFocus() { QT_NOT_USED }
- virtual WebDropData* GetDropData() const { QT_NOT_YET_IMPLEMENTED return 0; }
+ virtual content::DropData* GetDropData() const { QT_NOT_YET_IMPLEMENTED return 0; }
virtual gfx::Rect GetViewBounds() const { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); }
virtual void ShowPopupMenu(const gfx::Rect& bounds, int item_height, double item_font_size, int selected_item,
- const std::vector<WebMenuItem>& items, bool right_aligned, bool allow_multiple_selection) { QT_NOT_YET_IMPLEMENTED }
+ const std::vector<content::MenuItem>& items, bool right_aligned, bool allow_multiple_selection) { QT_NOT_YET_IMPLEMENTED }
#if defined(OS_MACOSX)
virtual void SetAllowOverlappingViews(bool overlapping) { QT_NOT_YET_IMPLEMENTED }