diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:00:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:00:57 +0000 |
| commit | 8427a062d29aa762bf11a3384bb6c02fa2395b16 (patch) | |
| tree | 64fa1d2e4f39330eb0960cfe87c374e6be34b296 /content/shell | |
| parent | 574268ef75cf34e46b268ea035ace78b7c4b2dad (diff) | |
| download | chromium_src-8427a062d29aa762bf11a3384bb6c02fa2395b16.zip chromium_src-8427a062d29aa762bf11a3384bb6c02fa2395b16.tar.gz chromium_src-8427a062d29aa762bf11a3384bb6c02fa2395b16.tar.bz2 | |
Delete most web intents code.
It's already disabled, so this should have no observable effect.
The database code stays around until I've written a migration to delete the
webintents table.
The apps schema code stays around so that 'intent' blocks in apps are
silently ignored instead of causing an error.
BUG=173194
TBR=piman
Review URL: https://codereview.chromium.org/12225076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/webkit_test_runner.cc | 12 | ||||
| -rw-r--r-- | content/shell/webkit_test_runner.h | 9 |
2 files changed, 0 insertions, 21 deletions
diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc index 93275d4..9b380fd 100644 --- a/content/shell/webkit_test_runner.cc +++ b/content/shell/webkit_test_runner.cc @@ -48,7 +48,6 @@ using WebKit::WebDevToolsAgent; using WebKit::WebElement; using WebKit::WebFrame; using WebKit::WebGamepads; -using WebKit::WebIntentRequest; using WebKit::WebRect; using WebKit::WebSize; using WebKit::WebString; @@ -295,17 +294,6 @@ void WebKitTestRunner::applyPreferences() { Send(new ShellViewHostMsg_OverridePreferences(routing_id(), prefs)); } -#if defined(ENABLE_WEB_INTENTS) -void WebKitTestRunner::setCurrentWebIntentRequest( - const WebIntentRequest& request) { - intent_request_ = request; -} - -WebIntentRequest* WebKitTestRunner::currentWebIntentRequest() { - return &intent_request_; -} -#endif - std::string WebKitTestRunner::makeURLErrorDescription( const WebURLError& error) { std::string domain = error.domain.utf8(); diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h index 538aa9a..127689d 100644 --- a/content/shell/webkit_test_runner.h +++ b/content/shell/webkit_test_runner.h @@ -8,7 +8,6 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h" #include "v8/include/v8.h" @@ -63,10 +62,6 @@ class WebKitTestRunner : public RenderViewObserver, virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string& utf8_url); virtual ::WebTestRunner::WebPreferences* preferences(); virtual void applyPreferences(); -#if defined(ENABLE_WEB_INTENTS) - virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&); - virtual WebKit::WebIntentRequest* currentWebIntentRequest(); -#endif virtual std::string makeURLErrorDescription(const WebKit::WebURLError& error); void Reset(); @@ -100,10 +95,6 @@ class WebKitTestRunner : public RenderViewObserver, ::WebTestRunner::WebPreferences prefs_; -#if defined(ENABLE_WEB_INTENTS) - WebKit::WebIntentRequest intent_request_; -#endif - bool dump_editing_callbacks_; bool dump_frame_load_callbacks_; bool dump_user_gesture_in_frame_load_callbacks_; |