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

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

Issue 2775963002: s/same_page/same_document for DidCommitProvisionalLoad method. (Closed)
Patch Set: Addressed review comment Created 3 years, 9 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 #include <string> 10 #include <string>
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 private: 92 private:
93 FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes); 93 FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);
94 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, 94 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
95 ContentSettingsInterstitialPages); 95 ContentSettingsInterstitialPages);
96 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed); 96 FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed);
97 97
98 // RenderFrameObserver implementation. 98 // RenderFrameObserver implementation.
99 bool OnMessageReceived(const IPC::Message& message) override; 99 bool OnMessageReceived(const IPC::Message& message) override;
100 void DidCommitProvisionalLoad(bool is_new_navigation, 100 void DidCommitProvisionalLoad(bool is_new_navigation,
101 bool is_same_page_navigation) override; 101 bool is_same_document_navigation) override;
102 void OnDestruct() override; 102 void OnDestruct() override;
103 103
104 // chrome::mojom::InsecureContentRenderer: 104 // chrome::mojom::InsecureContentRenderer:
105 void SetAllowRunningInsecureContent() override; 105 void SetAllowRunningInsecureContent() override;
106 106
107 void OnInsecureContentRendererRequest( 107 void OnInsecureContentRendererRequest(
108 chrome::mojom::InsecureContentRendererRequest request); 108 chrome::mojom::InsecureContentRendererRequest request);
109 109
110 // Message handlers. 110 // Message handlers.
111 void OnLoadBlockedPlugins(const std::string& identifier); 111 void OnLoadBlockedPlugins(const std::string& identifier);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // If true, IsWhitelistedForContentSettings will always return true. 168 // If true, IsWhitelistedForContentSettings will always return true.
169 const bool should_whitelist_; 169 const bool should_whitelist_;
170 170
171 mojo::BindingSet<chrome::mojom::InsecureContentRenderer> 171 mojo::BindingSet<chrome::mojom::InsecureContentRenderer>
172 insecure_content_renderer_bindings_; 172 insecure_content_renderer_bindings_;
173 173
174 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver); 174 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
175 }; 175 };
176 176
177 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ 177 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_render_frame_observer.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698