Chromium Code Reviews| Index: content/shell/renderer/test_runner/web_test_proxy.h |
| diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h |
| index 72f59d18ab1553eb5e7fb2d38894e45600ac42ff..d62b4a787bac896a4bda3f9f9304cdf0c5cb69f3 100644 |
| --- a/content/shell/renderer/test_runner/web_test_proxy.h |
| +++ b/content/shell/renderer/test_runner/web_test_proxy.h |
| @@ -129,6 +129,8 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback { |
| // WebCompositeAndReadbackAsyncCallback implementation. |
| virtual void didCompositeAndReadback(const SkBitmap& bitmap); |
| + void SetAcceptLanguages(const std::string& accept_languages); |
| + |
| protected: |
| WebTestProxyBase(); |
| ~WebTestProxyBase(); |
| @@ -206,6 +208,8 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback { |
| blink::WebDOMMessageEvent); |
| void ResetInputMethod(); |
| + blink::WebString acceptLanguages(); |
| + |
| private: |
| template <class, typename, typename> |
| friend class WebFrameTestProxy; |
| @@ -236,6 +240,8 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback { |
| scoped_ptr<blink::WebMIDIClientMock> m_midiClient; |
| scoped_ptr<MockWebSpeechRecognizer> m_speechRecognizer; |
| + std::string accept_languages_; |
| + |
| private: |
| DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase); |
| }; |
| @@ -338,6 +344,9 @@ class WebTestProxy : public Base, public WebTestProxyBase { |
| virtual void postSpellCheckEvent(const blink::WebString& eventName) { |
| WebTestProxyBase::PostSpellCheckEvent(eventName); |
| } |
| + virtual blink::WebString acceptLanguages() { |
| + return WebTestProxy::acceptLanguages(); |
|
jochen (gone - plz use gerrit)
2014/05/23 12:54:18
should be WebTestProxyBase
|
| + } |
| private: |
| DISALLOW_COPY_AND_ASSIGN(WebTestProxy); |