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

Side by Side Diff: chrome/browser/content_settings/tab_specific_content_settings.h

Issue 10383292: Get rid of the need of ViewType::VIEW_TYPE_INTERSTITIAL_PAGE in content. There are no ViewType valu… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/browser/content_settings/tab_specific_content_settings.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_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 const LocalSharedObjectsContainer& blocked_local_shared_objects() const { 180 const LocalSharedObjectsContainer& blocked_local_shared_objects() const {
181 return blocked_local_shared_objects_; 181 return blocked_local_shared_objects_;
182 } 182 }
183 183
184 bool load_plugins_link_enabled() { return load_plugins_link_enabled_; } 184 bool load_plugins_link_enabled() { return load_plugins_link_enabled_; }
185 void set_load_plugins_link_enabled(bool enabled) { 185 void set_load_plugins_link_enabled(bool enabled) {
186 load_plugins_link_enabled_ = enabled; 186 load_plugins_link_enabled_ = enabled;
187 } 187 }
188 188
189 // content::WebContentsObserver overrides. 189 // content::WebContentsObserver overrides.
190 virtual void RenderViewForInterstitialPageCreated(
191 content::RenderViewHost* render_view_host) OVERRIDE;
190 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 192 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
191 virtual void DidNavigateMainFrame( 193 virtual void DidNavigateMainFrame(
192 const content::LoadCommittedDetails& details, 194 const content::LoadCommittedDetails& details,
193 const content::FrameNavigateParams& params) OVERRIDE; 195 const content::FrameNavigateParams& params) OVERRIDE;
194 virtual void DidStartProvisionalLoadForFrame( 196 virtual void DidStartProvisionalLoadForFrame(
195 int64 frame_id, 197 int64 frame_id,
196 bool is_main_frame, 198 bool is_main_frame,
197 const GURL& validated_url, 199 const GURL& validated_url,
198 bool is_error_page, 200 bool is_error_page,
199 content::RenderViewHost* render_view_host) OVERRIDE; 201 content::RenderViewHost* render_view_host) OVERRIDE;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 282
281 // Stores whether the user can load blocked plugins on this page. 283 // Stores whether the user can load blocked plugins on this page.
282 bool load_plugins_link_enabled_; 284 bool load_plugins_link_enabled_;
283 285
284 content::NotificationRegistrar registrar_; 286 content::NotificationRegistrar registrar_;
285 287
286 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 288 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
287 }; 289 };
288 290
289 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 291 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698