Chromium Code Reviews| Index: content/shell/renderer/test_runner/mock_color_chooser.cc |
| diff --git a/content/shell/renderer/test_runner/MockColorChooser.cpp b/content/shell/renderer/test_runner/mock_color_chooser.cc |
| similarity index 58% |
| rename from content/shell/renderer/test_runner/MockColorChooser.cpp |
| rename to content/shell/renderer/test_runner/mock_color_chooser.cc |
| index 67ee88076b1efba3fb150e3252e49731eb4455bd..3eec6068cc052acd242e7b2b5ca66a35ddda7520 100644 |
| --- a/content/shell/renderer/test_runner/MockColorChooser.cpp |
| +++ b/content/shell/renderer/test_runner/mock_color_chooser.cc |
| @@ -2,7 +2,7 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "content/shell/renderer/test_runner/MockColorChooser.h" |
| +#include "content/shell/renderer/test_runner/mock_color_chooser.h" |
| #include "content/shell/renderer/test_runner/WebTestDelegate.h" |
| #include "content/shell/renderer/test_runner/web_test_proxy.h" |
| @@ -17,27 +17,29 @@ public: |
| typedef void (MockColorChooser::*CallbackMethodType)(); |
| HostMethodTask(MockColorChooser* object, CallbackMethodType callback) |
| : WebMethodTask<MockColorChooser>(object) |
| - , m_callback(callback) |
| + , callback_(callback) |
|
jochen (gone - plz use gerrit)
2014/07/22 07:26:45
, should go on previous line
Abhishek
2014/07/22 10:49:56
Done.
|
| { } |
| - virtual void runIfValid() OVERRIDE { (m_object->*m_callback)(); } |
| + virtual void runIfValid() OVERRIDE { (m_object->*callback_)(); } |
| private: |
| - CallbackMethodType m_callback; |
| + CallbackMethodType callback_; |
| }; |
| } |
| -MockColorChooser::MockColorChooser(blink::WebColorChooserClient* client, WebTestDelegate* delegate, WebTestProxyBase* proxy) |
| - : m_client(client) |
| - , m_delegate(delegate) |
| - , m_proxy(proxy) |
| +MockColorChooser::MockColorChooser(blink::WebColorChooserClient* client, |
| + WebTestDelegate* delegate, |
| + WebTestProxyBase* proxy) |
| + : client_(client) |
| + , delegate_(delegate) |
|
jochen (gone - plz use gerrit)
2014/07/22 07:26:45
same here
Abhishek
2014/07/22 10:49:56
Done.
|
| + , proxy_(proxy) |
| { |
| - m_proxy->DidOpenChooser(); |
| + proxy_->DidOpenChooser(); |
| } |
| MockColorChooser::~MockColorChooser() |
| { |
| - m_proxy->DidCloseChooser(); |
| + proxy_->DidCloseChooser(); |
| } |
| void MockColorChooser::setSelectedColor(const blink::WebColor) |
|
jochen (gone - plz use gerrit)
2014/07/22 07:26:45
add parameter name also for unused args
Abhishek
2014/07/22 10:49:56
Done.
|
| @@ -46,12 +48,12 @@ void MockColorChooser::setSelectedColor(const blink::WebColor) |
| void MockColorChooser::endChooser() |
| { |
| - m_delegate->postDelayedTask(new HostMethodTask(this, &MockColorChooser::invokeDidEndChooser), 0); |
| + delegate_->postDelayedTask(new HostMethodTask(this, &MockColorChooser::InvokeDidEndChooser), 0); |
| } |
| -void MockColorChooser::invokeDidEndChooser() |
| +void MockColorChooser::InvokeDidEndChooser() |
| { |
| - m_client->didEndChooser(); |
| + client_->didEndChooser(); |
| } |
| } // namespace content |