diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 10:05:19 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 10:05:19 +0000 |
commit | 8d6cba4c551a773707f441d5f2955948ba6b2450 (patch) | |
tree | aaad1b50f3fb696c4f39a4dc078149b7560b8160 /chrome | |
parent | 927a672386c66a29f84f622e1d1fa2f42a45be3b (diff) | |
download | chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.zip chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.tar.gz chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.tar.bz2 |
Update Chrome to use WebKitPlatformSupport instead of WebKitClient.
Review URL: http://codereview.chromium.org/7831035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-x | chrome/PRESUBMIT.py | 2 | ||||
-rw-r--r-- | chrome/browser/autofill/credit_card.cc | 6 | ||||
-rw-r--r-- | chrome/browser/idbbindingutilities_browsertest.cc | 6 | ||||
-rw-r--r-- | chrome/browser/sessions/tab_restore_service_browsertest.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 5 | ||||
-rw-r--r-- | chrome/test/base/render_view_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/base/render_view_test.h | 11 | ||||
-rw-r--r-- | chrome/test/base/run_all_unittests.cc | 10 |
8 files changed, 24 insertions, 22 deletions
diff --git a/chrome/PRESUBMIT.py b/chrome/PRESUBMIT.py index 86be7e9..e9f377b 100755 --- a/chrome/PRESUBMIT.py +++ b/chrome/PRESUBMIT.py @@ -35,7 +35,7 @@ EXCLUDE = ( # Too much math on one line? r'bloom_filter\.cc$', # Bogus ifdef tricks - r'renderer_webkitclient_impl\.cc$', + r'renderer_webkitplatformsupport_impl\.cc$', # Lines > 100 chars r'gcapi\.cc$', ) diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc index 81f8e9d..61057f2 100644 --- a/chrome/browser/autofill/credit_card.cc +++ b/chrome/browser/autofill/credit_card.cc @@ -583,9 +583,9 @@ std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card) { << UTF16ToUTF8(credit_card.GetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)); } -// These values must match the values in WebKitClientImpl in webkit/glue. We -// send these strings to WK, which then asks WebKitClientImpl to load the image -// data. +// These values must match the values in WebKitPlatformSupportImpl in +// webkit/glue. We send these strings to WebKit, which then asks +// WebKitPlatformSupportImpl to load the image data. const char* const kAmericanExpressCard = "americanExpressCC"; const char* const kDinersCard = "dinersCC"; const char* const kDiscoverCard = "discoverCC"; diff --git a/chrome/browser/idbbindingutilities_browsertest.cc b/chrome/browser/idbbindingutilities_browsertest.cc index 327b723..ed126e7 100644 --- a/chrome/browser/idbbindingutilities_browsertest.cc +++ b/chrome/browser/idbbindingutilities_browsertest.cc @@ -17,7 +17,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" #include "webkit/glue/idb_bindings.h" #include "webkit/glue/web_io_operators.h" -#include "webkit/glue/webkitclient_impl.h" +#include "webkit/glue/webkitplatformsupport_impl.h" using WebKit::WebSerializedScriptValue; @@ -37,8 +37,8 @@ class ScopedShutdownWebKit { // Sanity test, check the function call directly outside the sandbox. TEST(IDBKeyPathWithoutSandbox, Value) { - webkit_glue::WebKitClientImpl webkit_client; - WebKit::initialize(&webkit_client); + webkit_glue::WebKitPlatformSupportImpl webkit_platform_support; + WebKit::initialize(&webkit_platform_support); ScopedShutdownWebKit shutdown_webkit; char16 data[] = {0x0353,0x6f66,0x536f,0x7a03,0x6f6f,0x017b}; diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc index 1815375..ee4357c 100644 --- a/chrome/browser/sessions/tab_restore_service_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc @@ -49,7 +49,7 @@ class TabRestoreServiceTest : public RenderViewHostTestHarness { RenderViewHostTestHarness::SetUp(); time_factory_ = new TabRestoreTimeFactory(); service_.reset(new TabRestoreService(profile(), time_factory_)); - WebKit::initialize(&webkitclient_); + WebKit::initialize(&webkit_platform_support_); } virtual void TearDown() { @@ -119,7 +119,7 @@ class TabRestoreServiceTest : public RenderViewHostTestHarness { GURL url3_; scoped_ptr<TabRestoreService> service_; TabRestoreTimeFactory* time_factory_; - RenderViewTest::RendererWebKitClientImplNoSandbox webkitclient_; + RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_; }; TEST_F(TabRestoreServiceTest, Basic) { diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 858d5ad..2057aa9 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -574,10 +574,11 @@ bool ChromeContentRendererClient::RunIdleHandlerWhenWidgetsHidden() { } bool ChromeContentRendererClient::AllowPopup(const GURL& creator) { + return true; // Extensions and apps always allowed to create unrequested popups. The second // check is necessary to include content scripts. - return extension_dispatcher_->extensions()->GetByURL(creator) || - bindings_utils::GetInfoForCurrentContext(); + // return extension_dispatcher_->extensions()->GetByURL(creator) || + // bindings_utils::GetInfoForCurrentContext(); } bool ChromeContentRendererClient::ShouldFork(WebFrame* frame, diff --git a/chrome/test/base/render_view_test.cc b/chrome/test/base/render_view_test.cc index f197e91..10f5b60 100644 --- a/chrome/test/base/render_view_test.cc +++ b/chrome/test/base/render_view_test.cc @@ -107,7 +107,7 @@ void RenderViewTest::SetUp() { // Setting flags and really doing anything with WebKit is fairly fragile and // hacky, but this is the world we live in... webkit_glue::SetJavaScriptFlags(" --expose-gc"); - WebKit::initialize(&webkitclient_); + WebKit::initialize(&webkit_platform_support_); WebScriptController::registerExtension(JsonSchemaJsV8Extension::Get()); WebScriptController::registerExtension(EventBindings::Get( extension_dispatcher_)); diff --git a/chrome/test/base/render_view_test.h b/chrome/test/base/render_view_test.h index a72afc0..50a3564 100644 --- a/chrome/test/base/render_view_test.h +++ b/chrome/test/base/render_view_test.h @@ -18,7 +18,7 @@ #include "content/common/native_web_keyboard_event.h" #include "content/common/sandbox_init_wrapper.h" #include "content/renderer/render_view.h" -#include "content/renderer/renderer_webkitclient_impl.h" +#include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "chrome/renderer/chrome_content_renderer_client.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" @@ -34,9 +34,10 @@ class RendererMainPlatformDelegate; class RenderViewTest : public testing::Test { public: - // A special WebKitClientImpl class for getting rid off the dependency to the - // sandbox, which is not available in RenderViewTest. - class RendererWebKitClientImplNoSandbox : public RendererWebKitClientImpl { + // A special WebKitPlatformSupportImpl class for getting rid off the + // dependency to the sandbox, which is not available in RenderViewTest. + class RendererWebKitPlatformSupportImplNoSandbox : + public RendererWebKitPlatformSupportImpl { public: virtual WebKit::WebSandboxSupport* sandboxSupport() { return NULL; @@ -98,7 +99,7 @@ class RenderViewTest : public testing::Test { MockRenderThread render_thread_; scoped_ptr<MockRenderProcess> mock_process_; scoped_refptr<RenderView> view_; - RendererWebKitClientImplNoSandbox webkitclient_; + RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_; scoped_ptr<MockKeyboard> mock_keyboard_; // Used to setup the process so renderers can run. diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc index 455ec28..a1b8746 100644 --- a/chrome/test/base/run_all_unittests.cc +++ b/chrome/test/base/run_all_unittests.cc @@ -4,14 +4,14 @@ #include "chrome/test/base/chrome_test_suite.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h" namespace { // A stubbed out webkit client impl. -class UnitTestWebKitClient : public WebKit::WebKitClient { +class UnitTestWebKitPlatformSupport : public WebKit::WebKitPlatformSupport { public: - UnitTestWebKitClient() { + UnitTestWebKitPlatformSupport() { } virtual void cryptographicallyRandomValues( @@ -33,7 +33,7 @@ class UnitTestTestSuite : public ChromeTestSuite { protected: virtual void Initialize() { - WebKit::initialize(&webkitclient_); + WebKit::initialize(&webkit_platform_support_); ChromeTestSuite::Initialize(); } virtual void Shutdown() { @@ -41,7 +41,7 @@ class UnitTestTestSuite : public ChromeTestSuite { WebKit::shutdown(); } - UnitTestWebKitClient webkitclient_; + UnitTestWebKitPlatformSupport webkit_platform_support_; }; } // namespace |