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

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

Issue 1835753002: Reset content settings caches during provisional load start instead of commit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move things under DidCreateNewDocument instead of DidStartProvisionalLoad Created 4 years, 8 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
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_CONTENT_SETTINGS_OBSERVER_H_ 5 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
6 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ 6 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 bool AreNPAPIPluginsBlocked() const; 89 bool AreNPAPIPluginsBlocked() const;
90 90
91 private: 91 private:
92 FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes); 92 FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);
93 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, 93 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
94 ContentSettingsInterstitialPages); 94 ContentSettingsInterstitialPages);
95 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed); 95 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed);
96 96
97 // RenderFrameObserver implementation. 97 // RenderFrameObserver implementation.
98 bool OnMessageReceived(const IPC::Message& message) override; 98 bool OnMessageReceived(const IPC::Message& message) override;
99 void DidCreateNewDocument() override;
99 void DidCommitProvisionalLoad(bool is_new_navigation, 100 void DidCommitProvisionalLoad(bool is_new_navigation,
100 bool is_same_page_navigation) override; 101 bool is_same_page_navigation) override;
101 102
102 // Message handlers. 103 // Message handlers.
103 void OnLoadBlockedPlugins(const std::string& identifier); 104 void OnLoadBlockedPlugins(const std::string& identifier);
104 void OnSetAsInterstitial(); 105 void OnSetAsInterstitial();
105 void OnNPAPINotSupported(); 106 void OnNPAPINotSupported();
106 void OnSetAllowDisplayingInsecureContent(bool allow); 107 void OnSetAllowDisplayingInsecureContent(bool allow);
107 void OnSetAllowRunningInsecureContent(bool allow); 108 void OnSetAllowRunningInsecureContent(bool allow);
108 void OnReloadFrame(); 109 void OnReloadFrame();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 typedef std::map<int, blink::WebContentSettingCallbacks> PermissionRequestMap; 163 typedef std::map<int, blink::WebContentSettingCallbacks> PermissionRequestMap;
163 PermissionRequestMap permission_requests_; 164 PermissionRequestMap permission_requests_;
164 165
165 // If true, IsWhitelistedForContentSettings will always return true. 166 // If true, IsWhitelistedForContentSettings will always return true.
166 const bool should_whitelist_; 167 const bool should_whitelist_;
167 168
168 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver); 169 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
169 }; 170 };
170 171
171 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ 172 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/content_settings_observer.cc » ('j') | chrome/renderer/content_settings_observer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698