Removed the frame parameter from didChangeBrandColor because

the RenderFrame and WebFrame has 1:1 mapping now

Review URL: https://codereview.chromium.org/339133004

git-svn-id: svn://svn.chromium.org/blink/trunk@176459 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 0ecd0b3e
......@@ -453,7 +453,7 @@ void FrameLoaderClientImpl::dispatchDidFirstVisuallyNonEmptyLayout()
void FrameLoaderClientImpl::dispatchDidChangeBrandColor()
{
if (m_webFrame->client())
m_webFrame->client()->didChangeBrandColor(m_webFrame);
m_webFrame->client()->didChangeBrandColor();
}
NavigationPolicy FrameLoaderClientImpl::decidePolicyForNavigation(const ResourceRequest& request, DocumentLoader* loader, NavigationPolicy policy)
......
......@@ -5548,7 +5548,6 @@ class BrandColorTestWebFrameClient : public FrameTestHelpers::TestWebFrameClient
public:
BrandColorTestWebFrameClient()
: m_didNotify(false)
, m_brandColor(0)
{
}
......@@ -5557,20 +5556,13 @@ public:
return m_didNotify;
}
WebColor brandColor() const
{
return m_brandColor;
}
private:
virtual void didChangeBrandColor(WebLocalFrame* webLocalFrame)
virtual void didChangeBrandColor()
{
m_didNotify = true;
m_brandColor = webLocalFrame->document().brandColor();
}
bool m_didNotify;
WebColor m_brandColor;
};
TEST_F(WebFrameTest, BrandColor)
......@@ -5580,7 +5572,7 @@ TEST_F(WebFrameTest, BrandColor)
BrandColorTestWebFrameClient client;
webViewHelper.initializeAndLoad(m_baseURL + "brand_color_test.html", false, &client);
EXPECT_TRUE(client.didNotify());
EXPECT_EQ(0xff0000ff, client.brandColor());
EXPECT_EQ(0xff0000ff, webViewHelper.webViewImpl()->mainFrameImpl()->document().brandColor());
}
} // namespace
......@@ -267,7 +267,7 @@ public:
virtual void didChangeManifest(WebLocalFrame*) { }
// The frame's brand color has changed.
virtual void didChangeBrandColor(WebLocalFrame*) { }
virtual void didChangeBrandColor() { }
// Misc ----------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment