| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/renderer/test_runner/web_test_proxy.h" | 5 #include "content/shell/renderer/test_runner/web_test_proxy.h" |
| 6 | 6 |
| 7 #include <cctype> | 7 #include <cctype> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 bool wait_for_popup_; | 80 bool wait_for_popup_; |
| 81 gfx::Point popup_position_; | 81 gfx::Point popup_position_; |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 class HostMethodTask : public WebMethodTask<WebTestProxyBase> { | 84 class HostMethodTask : public WebMethodTask<WebTestProxyBase> { |
| 85 public: | 85 public: |
| 86 typedef void (WebTestProxyBase::*CallbackMethodType)(); | 86 typedef void (WebTestProxyBase::*CallbackMethodType)(); |
| 87 HostMethodTask(WebTestProxyBase* object, CallbackMethodType callback) | 87 HostMethodTask(WebTestProxyBase* object, CallbackMethodType callback) |
| 88 : WebMethodTask<WebTestProxyBase>(object), callback_(callback) {} | 88 : WebMethodTask<WebTestProxyBase>(object), callback_(callback) {} |
| 89 | 89 |
| 90 virtual void RunIfValid() OVERRIDE { (object_->*callback_)(); } | 90 virtual void RunIfValid() override { (object_->*callback_)(); } |
| 91 | 91 |
| 92 private: | 92 private: |
| 93 CallbackMethodType callback_; | 93 CallbackMethodType callback_; |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 void PrintFrameDescription(WebTestDelegate* delegate, blink::WebFrame* frame) { | 96 void PrintFrameDescription(WebTestDelegate* delegate, blink::WebFrame* frame) { |
| 97 std::string name8 = frame->uniqueName().utf8(); | 97 std::string name8 = frame->uniqueName().utf8(); |
| 98 if (frame == frame->view()->mainFrame()) { | 98 if (frame == frame->view()->mainFrame()) { |
| 99 if (!name8.length()) { | 99 if (!name8.length()) { |
| 100 delegate->PrintMessage("main frame"); | 100 delegate->PrintMessage("main frame"); |
| (...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1338 if (!push_client_.get()) | 1338 if (!push_client_.get()) |
| 1339 push_client_.reset(new MockWebPushClient); | 1339 push_client_.reset(new MockWebPushClient); |
| 1340 return push_client_.get(); | 1340 return push_client_.get(); |
| 1341 } | 1341 } |
| 1342 | 1342 |
| 1343 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() { | 1343 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() { |
| 1344 return GetPushClientMock(); | 1344 return GetPushClientMock(); |
| 1345 } | 1345 } |
| 1346 | 1346 |
| 1347 } // namespace content | 1347 } // namespace content |
| OLD | NEW |