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

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

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

Powered by Google App Engine
This is Rietveld 408576698