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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Fix unit tests Created 3 years, 11 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 blink::WebContentSecurityPolicyType type, 509 blink::WebContentSecurityPolicyType type,
510 blink::WebContentSecurityPolicySource source) override; 510 blink::WebContentSecurityPolicySource source) override;
511 void didChangeFrameOwnerProperties( 511 void didChangeFrameOwnerProperties(
512 blink::WebFrame* child_frame, 512 blink::WebFrame* child_frame,
513 const blink::WebFrameOwnerProperties& frame_owner_properties) override; 513 const blink::WebFrameOwnerProperties& frame_owner_properties) override;
514 void didMatchCSS( 514 void didMatchCSS(
515 blink::WebLocalFrame* frame, 515 blink::WebLocalFrame* frame,
516 const blink::WebVector<blink::WebString>& newly_matching_selectors, 516 const blink::WebVector<blink::WebString>& newly_matching_selectors,
517 const blink::WebVector<blink::WebString>& stopped_matching_selectors) 517 const blink::WebVector<blink::WebString>& stopped_matching_selectors)
518 override; 518 override;
519 void setHasReceivedUserGesture() override;
519 bool shouldReportDetailedMessageForSource( 520 bool shouldReportDetailedMessageForSource(
520 const blink::WebString& source) override; 521 const blink::WebString& source) override;
521 void didAddMessageToConsole(const blink::WebConsoleMessage& message, 522 void didAddMessageToConsole(const blink::WebConsoleMessage& message,
522 const blink::WebString& source_name, 523 const blink::WebString& source_name,
523 unsigned source_line, 524 unsigned source_line,
524 const blink::WebString& stack_trace) override; 525 const blink::WebString& stack_trace) override;
525 void loadURLExternally(const blink::WebURLRequest& request, 526 void loadURLExternally(const blink::WebURLRequest& request,
526 blink::WebNavigationPolicy policy, 527 blink::WebNavigationPolicy policy,
527 const blink::WebString& suggested_name, 528 const blink::WebString& suggested_name,
528 bool should_replace_current_entry) override; 529 bool should_replace_current_entry) override;
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 const std::map<GURL, base::FilePath>& url_to_local_path, 872 const std::map<GURL, base::FilePath>& url_to_local_path,
872 const std::map<int, base::FilePath>& frame_routing_id_to_local_path); 873 const std::map<int, base::FilePath>& frame_routing_id_to_local_path);
873 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params); 874 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params);
874 void OnFind(int request_id, 875 void OnFind(int request_id,
875 const base::string16& search_text, 876 const base::string16& search_text,
876 const blink::WebFindOptions& options); 877 const blink::WebFindOptions& options);
877 void OnClearActiveFindMatch(); 878 void OnClearActiveFindMatch();
878 void OnStopFinding(StopFindAction action); 879 void OnStopFinding(StopFindAction action);
879 void OnEnableViewSourceMode(); 880 void OnEnableViewSourceMode();
880 void OnSuppressFurtherDialogs(); 881 void OnSuppressFurtherDialogs();
881 void OnSetHasReceivedUserGesture();
882 void OnFileChooserResponse( 882 void OnFileChooserResponse(
883 const std::vector<content::FileChooserFileInfo>& files); 883 const std::vector<content::FileChooserFileInfo>& files);
884 void OnClearFocusedElement(); 884 void OnClearFocusedElement();
885 #if defined(OS_ANDROID) 885 #if defined(OS_ANDROID)
886 void OnActivateNearestFindResult(int request_id, float x, float y); 886 void OnActivateNearestFindResult(int request_id, float x, float y);
887 void OnGetNearestFindResult(int request_id, float x, float y); 887 void OnGetNearestFindResult(int request_id, float x, float y);
888 void OnFindMatchRects(int current_version); 888 void OnFindMatchRects(int current_version);
889 #endif 889 #endif
890 890
891 #if defined(USE_EXTERNAL_POPUP_MENU) 891 #if defined(USE_EXTERNAL_POPUP_MENU)
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 bool browser_side_navigation_pending_ = false; 1364 bool browser_side_navigation_pending_ = false;
1365 1365
1366 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1366 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1367 1367
1368 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1368 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1369 }; 1369 };
1370 1370
1371 } // namespace content 1371 } // namespace content
1372 1372
1373 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1373 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698