Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(979)

Side by Side Diff: content/shell/renderer/test_runner/web_test_proxy.h

Issue 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test fix Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "content/shell/renderer/test_runner/WebTask.h" 15 #include "content/shell/renderer/test_runner/WebTask.h"
16 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac k.h" 16 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac k.h"
17 #include "third_party/WebKit/public/platform/WebRect.h" 17 #include "third_party/WebKit/public/platform/WebRect.h"
18 #include "third_party/WebKit/public/platform/WebScreenInfo.h" 18 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
19 #include "third_party/WebKit/public/platform/WebURLError.h" 19 #include "third_party/WebKit/public/platform/WebURLError.h"
20 #include "third_party/WebKit/public/platform/WebURLRequest.h" 20 #include "third_party/WebKit/public/platform/WebURLRequest.h"
21 #include "third_party/WebKit/public/web/WebAXEnums.h" 21 #include "third_party/WebKit/public/web/WebAXEnums.h"
22 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" 22 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
23 #include "third_party/WebKit/public/web/WebDataSource.h" 23 #include "third_party/WebKit/public/web/WebDataSource.h"
24 #include "third_party/WebKit/public/web/WebDragOperation.h" 24 #include "third_party/WebKit/public/web/WebDragOperation.h"
25 #include "third_party/WebKit/public/web/WebFrame.h" 25 #include "third_party/WebKit/public/web/WebFrame.h"
26 #include "third_party/WebKit/public/web/WebFrameClient.h"
26 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" 27 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
27 #include "third_party/WebKit/public/web/WebIconURL.h" 28 #include "third_party/WebKit/public/web/WebIconURL.h"
28 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" 29 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
29 #include "third_party/WebKit/public/web/WebNavigationType.h" 30 #include "third_party/WebKit/public/web/WebNavigationType.h"
30 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" 31 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
31 #include "third_party/WebKit/public/web/WebTextAffinity.h" 32 #include "third_party/WebKit/public/web/WebTextAffinity.h"
32 #include "third_party/WebKit/public/web/WebTextDirection.h" 33 #include "third_party/WebKit/public/web/WebTextDirection.h"
33 34
34 class SkCanvas; 35 class SkCanvas;
35 36
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 const blink::WebURLResponse& redirect_response); 224 const blink::WebURLResponse& redirect_response);
224 void DidReceiveResponse(blink::WebLocalFrame* frame, 225 void DidReceiveResponse(blink::WebLocalFrame* frame,
225 unsigned identifier, 226 unsigned identifier,
226 const blink::WebURLResponse& response); 227 const blink::WebURLResponse& response);
227 void DidChangeResourcePriority(blink::WebLocalFrame* frame, 228 void DidChangeResourcePriority(blink::WebLocalFrame* frame,
228 unsigned identifier, 229 unsigned identifier,
229 const blink::WebURLRequest::Priority& priority, 230 const blink::WebURLRequest::Priority& priority,
230 int intra_priority_value); 231 int intra_priority_value);
231 void DidFinishResourceLoad(blink::WebLocalFrame* frame, unsigned identifier); 232 void DidFinishResourceLoad(blink::WebLocalFrame* frame, unsigned identifier);
232 blink::WebNavigationPolicy DecidePolicyForNavigation( 233 blink::WebNavigationPolicy DecidePolicyForNavigation(
233 blink::WebLocalFrame* frame, 234 const blink::WebFrameClient::NavigationPolicyInfo& info);
234 blink::WebDataSource::ExtraData* data,
235 const blink::WebURLRequest& request,
236 blink::WebNavigationType navigation_type,
237 blink::WebNavigationPolicy default_policy,
238 bool is_redirect);
239 bool WillCheckAndDispatchMessageEvent(blink::WebLocalFrame* source_frame, 235 bool WillCheckAndDispatchMessageEvent(blink::WebLocalFrame* source_frame,
240 blink::WebFrame* target_frame, 236 blink::WebFrame* target_frame,
241 blink::WebSecurityOrigin target, 237 blink::WebSecurityOrigin target,
242 blink::WebDOMMessageEvent event); 238 blink::WebDOMMessageEvent event);
243 void ResetInputMethod(); 239 void ResetInputMethod();
244 240
245 blink::WebString acceptLanguages(); 241 blink::WebString acceptLanguages();
246 blink::WebPushClient* GetWebPushClient(); 242 blink::WebPushClient* GetWebPushClient();
247 243
248 private: 244 private:
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 return WebTestProxyBase::GetWebPushClient(); 393 return WebTestProxyBase::GetWebPushClient();
398 } 394 }
399 395
400 private: 396 private:
401 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 397 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
402 }; 398 };
403 399
404 } // namespace content 400 } // namespace content
405 401
406 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 402 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/web_frame_test_proxy.h ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698