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

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

Issue 8889008: Revert 113579 - Content settings: allow scripts on interstitial pages even if JavaScript is blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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.h ('k') | chrome/renderer/chrome_render_view_observer.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_CHROME_RENDER_VIEW_OBSERVER_H_ 5 #ifndef CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
6 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ 6 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void OnJavaScriptStressTestControl(int cmd, int param); 126 void OnJavaScriptStressTestControl(int cmd, int param);
127 void OnDownloadFavicon(int id, const GURL& image_url, int image_size); 127 void OnDownloadFavicon(int id, const GURL& image_url, int image_size);
128 void OnSetIsPrerendering(bool is_prerendering); 128 void OnSetIsPrerendering(bool is_prerendering);
129 void OnSetAllowDisplayingInsecureContent(bool allow); 129 void OnSetAllowDisplayingInsecureContent(bool allow);
130 void OnSetAllowRunningInsecureContent(bool allow); 130 void OnSetAllowRunningInsecureContent(bool allow);
131 void OnSetClientSidePhishingDetection(bool enable_phishing_detection); 131 void OnSetClientSidePhishingDetection(bool enable_phishing_detection);
132 void OnSetVisuallyDeemphasized(bool deemphasized); 132 void OnSetVisuallyDeemphasized(bool deemphasized);
133 void OnStartFrameSniffer(const string16& frame_name); 133 void OnStartFrameSniffer(const string16& frame_name);
134 void OnGetFPS(); 134 void OnGetFPS();
135 void OnAddStrictSecurityHost(const std::string& host); 135 void OnAddStrictSecurityHost(const std::string& host);
136 void OnSetAsInterstitial();
137 136
138 // Captures the thumbnail and text contents for indexing for the given load 137 // Captures the thumbnail and text contents for indexing for the given load
139 // ID. If the view's load ID is different than the parameter, this call is 138 // ID. If the view's load ID is different than the parameter, this call is
140 // a NOP. Typically called on a timer, so the load ID may have changed in the 139 // a NOP. Typically called on a timer, so the load ID may have changed in the
141 // meantime. 140 // meantime.
142 void CapturePageInfo(int load_id, bool preliminary_capture); 141 void CapturePageInfo(int load_id, bool preliminary_capture);
143 142
144 // Retrieves the text from the given frame contents, the page text up to the 143 // Retrieves the text from the given frame contents, the page text up to the
145 // maximum amount kMaxIndexChars will be placed into the given buffer. 144 // maximum amount kMaxIndexChars will be placed into the given buffer.
146 void CaptureText(WebKit::WebFrame* frame, string16* contents); 145 void CaptureText(WebKit::WebFrame* frame, string16* contents);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // ImageResourceFetchers schedule via DownloadImage. 223 // ImageResourceFetchers schedule via DownloadImage.
225 ImageResourceFetcherList image_fetchers_; 224 ImageResourceFetcherList image_fetchers_;
226 225
227 // A color page overlay when visually de-emaphasized. 226 // A color page overlay when visually de-emaphasized.
228 scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_; 227 scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_;
229 228
230 DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver); 229 DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver);
231 }; 230 };
232 231
233 #endif // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ 232 #endif // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698