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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.h

Issue 1690633002: Revert of Remove the is_loading_ field from WebContentsImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 4
5 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 FrameTree frame_tree_; 264 FrameTree frame_tree_;
265 265
266 // The IDs for the Render[View|Process]Host hidden by this interstitial. 266 // The IDs for the Render[View|Process]Host hidden by this interstitial.
267 int original_child_id_; 267 int original_child_id_;
268 int original_rvh_id_; 268 int original_rvh_id_;
269 269
270 // Whether or not we should change the title of the contents when hidden (to 270 // Whether or not we should change the title of the contents when hidden (to
271 // revert it to its original value). 271 // revert it to its original value).
272 bool should_revert_web_contents_title_; 272 bool should_revert_web_contents_title_;
273 273
274 // Whether or not the contents was loading resources when the interstitial was
275 // shown. We restore this state if the user proceeds from the interstitial.
276 bool web_contents_was_loading_;
277
274 // Whether the ResourceDispatcherHost has been notified to cancel/resume the 278 // Whether the ResourceDispatcherHost has been notified to cancel/resume the
275 // resource requests blocked for the RenderViewHost. 279 // resource requests blocked for the RenderViewHost.
276 bool resource_dispatcher_host_notified_; 280 bool resource_dispatcher_host_notified_;
277 281
278 // The original title of the contents that should be reverted to when the 282 // The original title of the contents that should be reverted to when the
279 // interstitial is hidden. 283 // interstitial is hidden.
280 base::string16 original_web_contents_title_; 284 base::string16 original_web_contents_title_;
281 285
282 // Our RenderViewHostViewDelegate, necessary for accelerators to work. 286 // Our RenderViewHostViewDelegate, necessary for accelerators to work.
283 scoped_ptr<InterstitialPageRVHDelegateView> rvh_delegate_view_; 287 scoped_ptr<InterstitialPageRVHDelegateView> rvh_delegate_view_;
284 288
285 // Settings passed to the renderer. 289 // Settings passed to the renderer.
286 mutable RendererPreferences renderer_preferences_; 290 mutable RendererPreferences renderer_preferences_;
287 291
288 bool create_view_; 292 bool create_view_;
289 293
290 scoped_ptr<InterstitialPageDelegate> delegate_; 294 scoped_ptr<InterstitialPageDelegate> delegate_;
291 295
292 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 296 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
293 297
294 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 298 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
295 299
296 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 300 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
297 }; 301 };
298 302
299 } // namespace content 303 } // namespace content
300 304
301 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 305 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698