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

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

Issue 271863005: Revert 268939 "Pass RenderFrameHost to WebContentObservers' mess..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | trunk/src/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 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 load_plugins_link_enabled_ = enabled; 276 load_plugins_link_enabled_ = enabled;
277 } 277 }
278 278
279 // Called to indicate whether access to the Pepper broker was allowed or 279 // Called to indicate whether access to the Pepper broker was allowed or
280 // blocked. 280 // blocked.
281 void SetPepperBrokerAllowed(bool allowed); 281 void SetPepperBrokerAllowed(bool allowed);
282 282
283 // content::WebContentsObserver overrides. 283 // content::WebContentsObserver overrides.
284 virtual void RenderFrameForInterstitialPageCreated( 284 virtual void RenderFrameForInterstitialPageCreated(
285 content::RenderFrameHost* render_frame_host) OVERRIDE; 285 content::RenderFrameHost* render_frame_host) OVERRIDE;
286 virtual bool OnMessageReceived( 286 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
287 const IPC::Message& message,
288 content::RenderFrameHost* render_frame_host) OVERRIDE;
289 virtual void DidNavigateMainFrame( 287 virtual void DidNavigateMainFrame(
290 const content::LoadCommittedDetails& details, 288 const content::LoadCommittedDetails& details,
291 const content::FrameNavigateParams& params) OVERRIDE; 289 const content::FrameNavigateParams& params) OVERRIDE;
292 virtual void DidStartProvisionalLoadForFrame( 290 virtual void DidStartProvisionalLoadForFrame(
293 int64 frame_id, 291 int64 frame_id,
294 int64 parent_frame_id, 292 int64 parent_frame_id,
295 bool is_main_frame, 293 bool is_main_frame,
296 const GURL& validated_url, 294 const GURL& validated_url,
297 bool is_error_page, 295 bool is_error_page,
298 bool is_iframe_srcdoc, 296 bool is_iframe_srcdoc,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 415
418 // The devices to be displayed in the media bubble when the media stream 416 // The devices to be displayed in the media bubble when the media stream
419 // request is requesting certain specific devices. 417 // request is requesting certain specific devices.
420 std::string media_stream_requested_audio_device_; 418 std::string media_stream_requested_audio_device_;
421 std::string media_stream_requested_video_device_; 419 std::string media_stream_requested_video_device_;
422 420
423 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 421 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
424 }; 422 };
425 423
426 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 424 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698