Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: Source/WebCore/page/ContextMenuController.cpp

Issue 13529026: Removing a bunch of unused platform code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix whitespace and compiler error on Mac. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/loader/icon/IconDatabase.cpp ('k') | Source/WebCore/page/EventHandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/ContextMenuController.cpp
diff --git a/Source/WebCore/page/ContextMenuController.cpp b/Source/WebCore/page/ContextMenuController.cpp
index 70ced1a0048622051c18f5e028d775cde1031c2a..a2aa88ffc674e3bcd358adb6f61adf97c4c8c0c3 100644
--- a/Source/WebCore/page/ContextMenuController.cpp
+++ b/Source/WebCore/page/ContextMenuController.cpp
@@ -243,11 +243,6 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item)
// For now, call into the client. This is temporary!
frame->editor()->copyImage(m_hitTestResult);
break;
-#if PLATFORM(QT) || PLATFORM(GTK)
- case ContextMenuItemTagCopyImageUrlToClipboard:
- frame->editor()->copyURL(m_hitTestResult.absoluteImageURL(), m_hitTestResult.textContent());
- break;
-#endif
case ContextMenuItemTagOpenMediaInNewWindow:
openNewWindow(m_hitTestResult.absoluteMediaURL(), frame);
break;
@@ -335,11 +330,6 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item)
insertUnicodeCharacter(zeroWidthNonJoiner, frame);
break;
#endif
-#if PLATFORM(GTK) || PLATFORM(QT)
- case ContextMenuItemTagSelectAll:
- frame->editor()->command("SelectAll").execute();
- break;
-#endif
case ContextMenuItemTagSpellingGuess: {
FrameSelection* frameSelection = frame->selection();
if (frame->editor()->shouldInsertText(item->title(), frameSelection->toNormalizedRange().get(), EditorInsertActionPasted)) {
@@ -742,10 +732,6 @@ void ContextMenuController::populate()
contextMenuItemTagDownloadImageToDisk());
ContextMenuItem CopyImageItem(ActionType, ContextMenuItemTagCopyImageToClipboard,
contextMenuItemTagCopyImageToClipboard());
-#if PLATFORM(QT) || PLATFORM(GTK)
- ContextMenuItem CopyImageUrlItem(ActionType, ContextMenuItemTagCopyImageUrlToClipboard,
- contextMenuItemTagCopyImageUrlToClipboard());
-#endif
ContextMenuItem OpenMediaInNewWindowItem(ActionType, ContextMenuItemTagOpenMediaInNewWindow, String());
ContextMenuItem CopyMediaLinkItem(ActionType, ContextMenuItemTagCopyMediaLinkToClipboard,
String());
@@ -759,13 +745,7 @@ void ContextMenuController::populate()
contextMenuItemTagToggleMediaLoop());
ContextMenuItem EnterVideoFullscreen(ActionType, ContextMenuItemTagEnterVideoFullscreen,
contextMenuItemTagEnterVideoFullscreen());
-#if PLATFORM(MAC)
- ContextMenuItem SearchSpotlightItem(ActionType, ContextMenuItemTagSearchInSpotlight,
- contextMenuItemTagSearchInSpotlight());
-#endif
-#if !PLATFORM(GTK)
ContextMenuItem SearchWebItem(ActionType, ContextMenuItemTagSearchWeb, contextMenuItemTagSearchWeb());
-#endif
ContextMenuItem CopyItem(ActionType, ContextMenuItemTagCopy, contextMenuItemTagCopy());
ContextMenuItem BackItem(ActionType, ContextMenuItemTagGoBack, contextMenuItemTagGoBack());
ContextMenuItem ForwardItem(ActionType, ContextMenuItemTagGoForward, contextMenuItemTagGoForward());
@@ -783,12 +763,6 @@ void ContextMenuController::populate()
contextMenuItemTagIgnoreGrammar());
ContextMenuItem CutItem(ActionType, ContextMenuItemTagCut, contextMenuItemTagCut());
ContextMenuItem PasteItem(ActionType, ContextMenuItemTagPaste, contextMenuItemTagPaste());
-#if PLATFORM(GTK)
- ContextMenuItem DeleteItem(ActionType, ContextMenuItemTagDelete, contextMenuItemTagDelete());
-#endif
-#if PLATFORM(GTK) || PLATFORM(QT)
- ContextMenuItem SelectAllItem(ActionType, ContextMenuItemTagSelectAll, contextMenuItemTagSelectAll());
-#endif
Node* node = m_hitTestResult.innerNonSharedNode();
if (!node)
@@ -810,10 +784,6 @@ void ContextMenuController::populate()
appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());
appendItem(DownloadFileItem, m_contextMenu.get());
}
-#if PLATFORM(QT)
- if (m_hitTestResult.isSelected())
- appendItem(CopyItem, m_contextMenu.get());
-#endif
appendItem(CopyLinkItem, m_contextMenu.get());
}
@@ -826,9 +796,6 @@ void ContextMenuController::populate()
appendItem(DownloadImageItem, m_contextMenu.get());
if (imageURL.isLocalFile() || m_hitTestResult.image())
appendItem(CopyImageItem, m_contextMenu.get());
-#if PLATFORM(QT) || PLATFORM(GTK)
- appendItem(CopyImageUrlItem, m_contextMenu.get());
-#endif
}
KURL mediaURL = m_hitTestResult.absoluteMediaURL();
@@ -1012,22 +979,13 @@ void ContextMenuController::populate()
appendItem(CutItem, m_contextMenu.get());
appendItem(CopyItem, m_contextMenu.get());
appendItem(PasteItem, m_contextMenu.get());
-#if PLATFORM(GTK)
- appendItem(DeleteItem, m_contextMenu.get());
- appendItem(*separatorItem(), m_contextMenu.get());
-#endif
-#if PLATFORM(GTK) || PLATFORM(QT)
- appendItem(SelectAllItem, m_contextMenu.get());
-#endif
if (!inPasswordField) {
-#if !PLATFORM(GTK)
appendItem(*separatorItem(), m_contextMenu.get());
ContextMenuItem SpellingAndGrammarMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu,
contextMenuItemTagSpellingMenu());
createAndAppendSpellingAndGrammarSubMenu(SpellingAndGrammarMenuItem);
appendItem(SpellingAndGrammarMenuItem, m_contextMenu.get());
-#endif
#if PLATFORM(MAC)
ContextMenuItem substitutionsMenuItem(SubmenuType, ContextMenuItemTagSubstitutionsMenu,
contextMenuItemTagSubstitutionsMenu());
@@ -1038,11 +996,7 @@ void ContextMenuController::populate()
createAndAppendTransformationsSubMenu(transformationsMenuItem);
appendItem(transformationsMenuItem, m_contextMenu.get());
#endif
-#if PLATFORM(GTK)
- bool shouldShowFontMenu = frame->editor()->canEditRichly();
-#else
bool shouldShowFontMenu = true;
-#endif
if (shouldShowFontMenu) {
ContextMenuItem FontMenuItem(SubmenuType, ContextMenuItemTagFontMenu,
contextMenuItemTagFontMenu());
@@ -1054,15 +1008,6 @@ void ContextMenuController::populate()
createAndAppendSpeechSubMenu(SpeechMenuItem);
appendItem(SpeechMenuItem, m_contextMenu.get());
#endif
-#if PLATFORM(GTK)
- EditorClient* client = frame->editor()->client();
- if (client && client->shouldShowUnicodeMenu()) {
- ContextMenuItem UnicodeMenuItem(SubmenuType, ContextMenuItemTagUnicode, contextMenuItemTagUnicode());
- createAndAppendUnicodeSubMenu(UnicodeMenuItem);
- appendItem(*separatorItem(), m_contextMenu.get());
- appendItem(UnicodeMenuItem, m_contextMenu.get());
- }
-#else
ContextMenuItem WritingDirectionMenuItem(SubmenuType, ContextMenuItemTagWritingDirectionMenu,
contextMenuItemTagWritingDirectionMenu());
createAndAppendWritingDirectionSubMenu(WritingDirectionMenuItem);
@@ -1079,7 +1024,6 @@ void ContextMenuController::populate()
}
}
}
-#endif
}
}
}
@@ -1309,9 +1253,6 @@ void ContextMenuController::checkOrEnableIfNeeded(ContextMenuItem& item) const
case ContextMenuItemTagOpenImageInNewWindow:
case ContextMenuItemTagDownloadImageToDisk:
case ContextMenuItemTagCopyImageToClipboard:
-#if PLATFORM(QT) || PLATFORM(GTK)
- case ContextMenuItemTagCopyImageUrlToClipboard:
-#endif
break;
case ContextMenuItemTagOpenMediaInNewWindow:
if (m_hitTestResult.mediaIsVideo())
« no previous file with comments | « Source/WebCore/loader/icon/IconDatabase.cpp ('k') | Source/WebCore/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698