diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 05:54:59 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 05:54:59 +0000 |
| commit | 7ea093ba47c5a1a1652f7249faf56399dd66876f (patch) | |
| tree | 9f6879802dc8445a09aa505b031f396138bb4605 /webkit/glue | |
| parent | fa7b6b547368d12ccd61f6cbf251f2ff0d37b504 (diff) | |
| download | chromium_src-7ea093ba47c5a1a1652f7249faf56399dd66876f.zip chromium_src-7ea093ba47c5a1a1652f7249faf56399dd66876f.tar.gz chromium_src-7ea093ba47c5a1a1652f7249faf56399dd66876f.tar.bz2 | |
Chrome changes to extract the code from V8Proxy that special-cases
when scripts are allowed despite user preferences disabling them.
Adds more accessors and comments to WebSecurityOrigin.
Removes no longer necessary webkit_glue functions.
Removes no longer necessary TemporaryGlue.h file.
R=abarth
BUG=none
TEST=browser features like the new tab page and history view should
still work when passing --disable-javascript to chrome. similarly,
file and ftp directory listings should remain functional when that
command line flag is specified.
Review URL: http://codereview.chromium.org/351013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.h | 8 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 14 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.h | 5 |
3 files changed, 0 insertions, 27 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index ba5d405..f52d902 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -190,14 +190,6 @@ void ClipboardReadHTML(Clipboard::Buffer buffer, string16* markup, GURL* url); // Returns true if successful, false otherwise. bool GetApplicationDirectory(FilePath* path); -// Gets the URL where the inspector's HTML file resides. It must use the -// protocol returned by GetUIResourceProtocol. -GURL GetInspectorURL(); - -// Gets the protocol that is used for all user interface resources, including -// the Inspector. It must end with "-resource". -std::string GetUIResourceProtocol(); - // Gets the directory where the launching executable resides on disk. // Path is an output parameter to receive the path. // Returns true if successful, false otherwise. diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 0bb2edca..a578d7c 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -414,18 +414,4 @@ WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); } -//-------------------------------------------------------------------------- -// BEGIN(TemporaryGlue) - -// These are temporary methods that the WebKit layer can use to call to the -// Glue layer. Once the Glue layer moves entirely into the WebKit layer, these -// methods will be deleted. - -WebCore::String WebKitClientImpl::uiResourceProtocol() { - return StdStringToString(webkit_glue::GetUIResourceProtocol()); -} - -// END(TemporaryGlue) -//-------------------------------------------------------------------------- - } // namespace webkit_glue diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h index e190465..8b6ab37 100644 --- a/webkit/glue/webkitclient_impl.h +++ b/webkit/glue/webkitclient_impl.h @@ -79,11 +79,6 @@ class WebKitClientImpl : public WebKit::WebKitClient { virtual void stopSharedTimer(); virtual void callOnMainThread(void (*func)()); - // These are temporary methods that the WebKit layer can use to call to the - // Glue layer. Once the Glue layer moves entirely into the WebKit layer, - // these methods will be deleted. - virtual WebCore::String uiResourceProtocol(); - private: void DoTimeout() { if (shared_timer_func_) |