OLD | NEW |
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 Loading... |
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(content::WebContents* web_contents, |
| 171 bool allowed_per_prefs, |
| 172 const url::Origin& origin, |
| 173 const GURL& resource_url) override; |
170 | 174 |
171 static gfx::Size GetShellDefaultSize(); | 175 static gfx::Size GetShellDefaultSize(); |
172 | 176 |
173 private: | 177 private: |
174 enum UIControl { | 178 enum UIControl { |
175 BACK_BUTTON, | 179 BACK_BUTTON, |
176 FORWARD_BUTTON, | 180 FORWARD_BUTTON, |
177 STOP_BUTTON | 181 STOP_BUTTON |
178 }; | 182 }; |
179 | 183 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 static base::Callback<void(Shell*)> shell_created_callback_; | 280 static base::Callback<void(Shell*)> shell_created_callback_; |
277 | 281 |
278 // True if the destructur of Shell should post a quit closure on the current | 282 // 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. | 283 // message loop if the destructed Shell object was the last one. |
280 static bool quit_message_loop_; | 284 static bool quit_message_loop_; |
281 }; | 285 }; |
282 | 286 |
283 } // namespace content | 287 } // namespace content |
284 | 288 |
285 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ | 289 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ |
OLD | NEW |