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

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

Issue 10577028: Move the mixed scripting infobar to a page action icon / content setting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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/content_settings_types.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // same page twice in a row. 202 // same page twice in a row.
203 int32 last_indexed_page_id_; 203 int32 last_indexed_page_id_;
204 // The toplevel URL that was last indexed. This is used together with the 204 // The toplevel URL that was last indexed. This is used together with the
205 // page id to decide whether to reindex in certain cases like history 205 // page id to decide whether to reindex in certain cases like history
206 // replacement. 206 // replacement.
207 GURL last_indexed_url_; 207 GURL last_indexed_url_;
208 208
209 // Insecure content may be permitted for the duration of this render view. 209 // Insecure content may be permitted for the duration of this render view.
210 bool allow_displaying_insecure_content_; 210 bool allow_displaying_insecure_content_;
211 bool allow_running_insecure_content_; 211 bool allow_running_insecure_content_;
212 bool warned_about_insecure_content_;
213 std::set<std::string> strict_security_hosts_; 212 std::set<std::string> strict_security_hosts_;
214 213
215 // External host exposed through automation controller. 214 // External host exposed through automation controller.
216 scoped_ptr<ExternalHostBindings> external_host_bindings_; 215 scoped_ptr<ExternalHostBindings> external_host_bindings_;
217 216
218 typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> > 217 typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> >
219 ImageResourceFetcherList; 218 ImageResourceFetcherList;
220 219
221 // ImageResourceFetchers schedule via DownloadImage. 220 // ImageResourceFetchers schedule via DownloadImage.
222 ImageResourceFetcherList image_fetchers_; 221 ImageResourceFetcherList image_fetchers_;
223 222
224 // A color page overlay when visually de-emaphasized. 223 // A color page overlay when visually de-emaphasized.
225 scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_; 224 scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_;
226 225
227 // Used to delay calling CapturePageInfo. 226 // Used to delay calling CapturePageInfo.
228 base::Timer capture_timer_; 227 base::Timer capture_timer_;
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/content_settings_types.h ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698