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

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

Issue 11090068: When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updatess Created 8 years, 2 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
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 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 // content::WebContentsObserver overrides. 229 // content::WebContentsObserver overrides.
230 virtual void RenderViewForInterstitialPageCreated( 230 virtual void RenderViewForInterstitialPageCreated(
231 content::RenderViewHost* render_view_host) OVERRIDE; 231 content::RenderViewHost* render_view_host) OVERRIDE;
232 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 232 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
233 virtual void DidNavigateMainFrame( 233 virtual void DidNavigateMainFrame(
234 const content::LoadCommittedDetails& details, 234 const content::LoadCommittedDetails& details,
235 const content::FrameNavigateParams& params) OVERRIDE; 235 const content::FrameNavigateParams& params) OVERRIDE;
236 virtual void DidStartProvisionalLoadForFrame( 236 virtual void DidStartProvisionalLoadForFrame(
237 int64 frame_id, 237 int64 frame_id,
238 int64 parent_frame_id,
238 bool is_main_frame, 239 bool is_main_frame,
239 const GURL& validated_url, 240 const GURL& validated_url,
240 bool is_error_page, 241 bool is_error_page,
241 content::RenderViewHost* render_view_host) OVERRIDE; 242 content::RenderViewHost* render_view_host) OVERRIDE;
242 virtual void AppCacheAccessed(const GURL& manifest_url, 243 virtual void AppCacheAccessed(const GURL& manifest_url,
243 bool blocked_by_policy) OVERRIDE; 244 bool blocked_by_policy) OVERRIDE;
244 245
245 // Message handlers. Public for testing. 246 // Message handlers. Public for testing.
246 void OnContentBlocked(ContentSettingsType type, 247 void OnContentBlocked(ContentSettingsType type,
247 const std::string& resource_identifier); 248 const std::string& resource_identifier);
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 341
341 // Stores whether the user can load blocked plugins on this page. 342 // Stores whether the user can load blocked plugins on this page.
342 bool load_plugins_link_enabled_; 343 bool load_plugins_link_enabled_;
343 344
344 content::NotificationRegistrar registrar_; 345 content::NotificationRegistrar registrar_;
345 346
346 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 347 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
347 }; 348 };
348 349
349 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 350 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698