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

Side by Side Diff: chrome/renderer/render_view.h

Issue 6272003: Add another didRunInsecureContent method. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_RENDERER_RENDER_VIEW_H_ 5 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
6 #define CHROME_RENDERER_RENDER_VIEW_H_ 6 #define CHROME_RENDERER_RENDER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, 608 virtual void didFinishResourceLoad(WebKit::WebFrame* frame,
609 unsigned identifier); 609 unsigned identifier);
610 virtual void didFailResourceLoad(WebKit::WebFrame* frame, 610 virtual void didFailResourceLoad(WebKit::WebFrame* frame,
611 unsigned identifier, 611 unsigned identifier,
612 const WebKit::WebURLError& error); 612 const WebKit::WebURLError& error);
613 virtual void didLoadResourceFromMemoryCache( 613 virtual void didLoadResourceFromMemoryCache(
614 WebKit::WebFrame* frame, 614 WebKit::WebFrame* frame,
615 const WebKit::WebURLRequest& request, 615 const WebKit::WebURLRequest& request,
616 const WebKit::WebURLResponse&); 616 const WebKit::WebURLResponse&);
617 virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); 617 virtual void didDisplayInsecureContent(WebKit::WebFrame* frame);
618
619 // We have two didRunInsecureContent's with the same name. That's because
620 // we're in the process of adding an argument and one of them will be correct.
621 // Once the WebKit change is in, the first should be removed the the second
622 // should be tagged with OVERRIDE.
618 virtual void didRunInsecureContent( 623 virtual void didRunInsecureContent(
619 WebKit::WebFrame* frame, 624 WebKit::WebFrame* frame,
620 const WebKit::WebSecurityOrigin& origin) OVERRIDE; 625 const WebKit::WebSecurityOrigin& origin);
626 virtual void didRunInsecureContent(
627 WebKit::WebFrame* frame,
628 const WebKit::WebSecurityOrigin& origin,
629 const WebKit::WebString& target);
abarth-chromium 2011/01/13 22:30:14 Not WebURL?
630
621 virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings); 631 virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
622 virtual bool allowDatabase(WebKit::WebFrame* frame, 632 virtual bool allowDatabase(WebKit::WebFrame* frame,
623 const WebKit::WebString& name, 633 const WebKit::WebString& name,
624 const WebKit::WebString& display_name, 634 const WebKit::WebString& display_name,
625 unsigned long estimated_size); 635 unsigned long estimated_size);
626 virtual void didNotAllowScript(WebKit::WebFrame* frame); 636 virtual void didNotAllowScript(WebKit::WebFrame* frame);
627 virtual void didNotAllowPlugins(WebKit::WebFrame* frame); 637 virtual void didNotAllowPlugins(WebKit::WebFrame* frame);
628 virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame); 638 virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame);
629 virtual void didCreateScriptContext(WebKit::WebFrame* frame); 639 virtual void didCreateScriptContext(WebKit::WebFrame* frame);
630 virtual void didDestroyScriptContext(WebKit::WebFrame* frame); 640 virtual void didDestroyScriptContext(WebKit::WebFrame* frame);
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 // ADDING NEW DATA? Please see if it fits appropriately in one of the above 1534 // ADDING NEW DATA? Please see if it fits appropriately in one of the above
1525 // sections rather than throwing it randomly at the end. If you're adding a 1535 // sections rather than throwing it randomly at the end. If you're adding a
1526 // bunch of stuff, you should probably create a helper class and put your 1536 // bunch of stuff, you should probably create a helper class and put your
1527 // data and methods on that to avoid bloating RenderView more. 1537 // data and methods on that to avoid bloating RenderView more.
1528 // --------------------------------------------------------------------------- 1538 // ---------------------------------------------------------------------------
1529 1539
1530 DISALLOW_COPY_AND_ASSIGN(RenderView); 1540 DISALLOW_COPY_AND_ASSIGN(RenderView);
1531 }; 1541 };
1532 1542
1533 #endif // CHROME_RENDERER_RENDER_VIEW_H_ 1543 #endif // CHROME_RENDERER_RENDER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698