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

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

Issue 438733002: Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=283728 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « content/public/browser/navigation_entry.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 virtual void didFinishResourceLoad(blink::WebLocalFrame* frame, 363 virtual void didFinishResourceLoad(blink::WebLocalFrame* frame,
364 unsigned identifier); 364 unsigned identifier);
365 virtual void didLoadResourceFromMemoryCache( 365 virtual void didLoadResourceFromMemoryCache(
366 blink::WebLocalFrame* frame, 366 blink::WebLocalFrame* frame,
367 const blink::WebURLRequest& request, 367 const blink::WebURLRequest& request,
368 const blink::WebURLResponse& response); 368 const blink::WebURLResponse& response);
369 virtual void didDisplayInsecureContent(blink::WebLocalFrame* frame); 369 virtual void didDisplayInsecureContent(blink::WebLocalFrame* frame);
370 virtual void didRunInsecureContent(blink::WebLocalFrame* frame, 370 virtual void didRunInsecureContent(blink::WebLocalFrame* frame,
371 const blink::WebSecurityOrigin& origin, 371 const blink::WebSecurityOrigin& origin,
372 const blink::WebURL& target); 372 const blink::WebURL& target);
373 virtual void didDetectXSS(blink::WebLocalFrame* frame,
374 const blink::WebURL& url,
375 bool blocked_entire_page);
376 virtual void didAbortLoading(blink::WebLocalFrame* frame); 373 virtual void didAbortLoading(blink::WebLocalFrame* frame);
377 virtual void didCreateScriptContext(blink::WebLocalFrame* frame, 374 virtual void didCreateScriptContext(blink::WebLocalFrame* frame,
378 v8::Handle<v8::Context> context, 375 v8::Handle<v8::Context> context,
379 int extension_group, 376 int extension_group,
380 int world_id); 377 int world_id);
381 virtual void willReleaseScriptContext(blink::WebLocalFrame* frame, 378 virtual void willReleaseScriptContext(blink::WebLocalFrame* frame,
382 v8::Handle<v8::Context> context, 379 v8::Handle<v8::Context> context,
383 int world_id); 380 int world_id);
384 virtual void didFirstVisuallyNonEmptyLayout(blink::WebLocalFrame* frame); 381 virtual void didFirstVisuallyNonEmptyLayout(blink::WebLocalFrame* frame);
385 virtual void didChangeScrollOffset(blink::WebLocalFrame* frame); 382 virtual void didChangeScrollOffset(blink::WebLocalFrame* frame);
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 RendererAccessibility* renderer_accessibility_; 692 RendererAccessibility* renderer_accessibility_;
696 693
697 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 694 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
698 695
699 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 696 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
700 }; 697 };
701 698
702 } // namespace content 699 } // namespace content
703 700
704 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 701 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/browser/navigation_entry.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698