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

Side by Side Diff: content/shell/browser/shell.h

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Address jam@ comments; many minor code and comment updates. Created 3 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_ 4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
5 #define CONTENT_SHELL_BROWSER_SHELL_H_ 5 #define CONTENT_SHELL_BROWSER_SHELL_H_
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 #endif 160 #endif
161 bool DidAddMessageToConsole(WebContents* source, 161 bool DidAddMessageToConsole(WebContents* source,
162 int32_t level, 162 int32_t level,
163 const base::string16& message, 163 const base::string16& message,
164 int32_t line_no, 164 int32_t line_no,
165 const base::string16& source_id) override; 165 const base::string16& source_id) override;
166 void RendererUnresponsive( 166 void RendererUnresponsive(
167 WebContents* source, 167 WebContents* source,
168 const WebContentsUnresponsiveState& unresponsive_state) override; 168 const WebContentsUnresponsiveState& unresponsive_state) override;
169 void ActivateContents(WebContents* contents) override; 169 void ActivateContents(WebContents* contents) override;
170 bool ShouldAllowRunningInsecureContent(
171 bool allowed_per_settings,
172 const url::Origin& origin,
173 const GURL& resource_url,
174 content::WebContents* web_contents) override;
170 175
171 static gfx::Size GetShellDefaultSize(); 176 static gfx::Size GetShellDefaultSize();
172 177
173 private: 178 private:
174 enum UIControl { 179 enum UIControl {
175 BACK_BUTTON, 180 BACK_BUTTON,
176 FORWARD_BUTTON, 181 FORWARD_BUTTON,
177 STOP_BUTTON 182 STOP_BUTTON
178 }; 183 };
179 184
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 static base::Callback<void(Shell*)> shell_created_callback_; 281 static base::Callback<void(Shell*)> shell_created_callback_;
277 282
278 // True if the destructur of Shell should post a quit closure on the current 283 // True if the destructur of Shell should post a quit closure on the current
279 // message loop if the destructed Shell object was the last one. 284 // message loop if the destructed Shell object was the last one.
280 static bool quit_message_loop_; 285 static bool quit_message_loop_;
281 }; 286 };
282 287
283 } // namespace content 288 } // namespace content
284 289
285 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 290 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698