| OLD | NEW |
| 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1238 // At the time the fullscreen widget was being shut down, did it have focus? | 1238 // At the time the fullscreen widget was being shut down, did it have focus? |
| 1239 // This is used to restore focus to the WebContentsView after both: 1) the | 1239 // This is used to restore focus to the WebContentsView after both: 1) the |
| 1240 // fullscreen widget is destroyed, and 2) the WebContentsDelegate has | 1240 // fullscreen widget is destroyed, and 2) the WebContentsDelegate has |
| 1241 // completed making layout changes to effect an exit from fullscreen mode. | 1241 // completed making layout changes to effect an exit from fullscreen mode. |
| 1242 bool fullscreen_widget_had_focus_at_shutdown_; | 1242 bool fullscreen_widget_had_focus_at_shutdown_; |
| 1243 | 1243 |
| 1244 // Whether this WebContents is responsible for displaying a subframe in a | 1244 // Whether this WebContents is responsible for displaying a subframe in a |
| 1245 // different process from its parent page. | 1245 // different process from its parent page. |
| 1246 bool is_subframe_; | 1246 bool is_subframe_; |
| 1247 | 1247 |
| 1248 // When a new tab is created asynchronously, stores the OpenURLParams needed |
| 1249 // to continue loading the page once the tab is ready. |
| 1250 scoped_ptr<OpenURLParams> delayed_open_url_params_; |
| 1251 |
| 1248 // Whether overscroll should be unconditionally disabled. | 1252 // Whether overscroll should be unconditionally disabled. |
| 1249 bool force_disable_overscroll_content_; | 1253 bool force_disable_overscroll_content_; |
| 1250 | 1254 |
| 1251 // Whether the last JavaScript dialog shown was suppressed. Used for testing. | 1255 // Whether the last JavaScript dialog shown was suppressed. Used for testing. |
| 1252 bool last_dialog_suppressed_; | 1256 bool last_dialog_suppressed_; |
| 1253 | 1257 |
| 1254 scoped_ptr<GeolocationServiceContext> geolocation_service_context_; | 1258 scoped_ptr<GeolocationServiceContext> geolocation_service_context_; |
| 1255 | 1259 |
| 1256 scoped_ptr<ScreenOrientationDispatcherHost> | 1260 scoped_ptr<ScreenOrientationDispatcherHost> |
| 1257 screen_orientation_dispatcher_host_; | 1261 screen_orientation_dispatcher_host_; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1290 // Adds/removes a callback called on creation of each new WebContents. | 1294 // Adds/removes a callback called on creation of each new WebContents. |
| 1291 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); | 1295 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); |
| 1292 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); | 1296 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); |
| 1293 | 1297 |
| 1294 DISALLOW_COPY_AND_ASSIGN(FriendZone); | 1298 DISALLOW_COPY_AND_ASSIGN(FriendZone); |
| 1295 }; | 1299 }; |
| 1296 | 1300 |
| 1297 } // namespace content | 1301 } // namespace content |
| 1298 | 1302 |
| 1299 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1303 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
| OLD | NEW |