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

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

Issue 2903593003: Fix crash bug http://crbug.com/725594 (Closed)
Patch Set: Prefer MakeUnique to raw new operator Created 3 years, 7 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
« no previous file with comments | « no previous file | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <memory> 10 #include <memory>
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 ActionState action_taken_; 258 ActionState action_taken_;
259 259
260 // The RenderViewHost displaying the interstitial contents. This is valid 260 // The RenderViewHost displaying the interstitial contents. This is valid
261 // until Hide is called, at which point it will be set to NULL, signifying 261 // until Hide is called, at which point it will be set to NULL, signifying
262 // that shutdown has started. 262 // that shutdown has started.
263 // TODO(creis): This is now owned by the FrameTree. We should route things 263 // TODO(creis): This is now owned by the FrameTree. We should route things
264 // through the tree's root RenderFrameHost instead. 264 // through the tree's root RenderFrameHost instead.
265 RenderViewHostImpl* render_view_host_; 265 RenderViewHostImpl* render_view_host_;
266 266
267 // The frame tree structure of the current page. 267 // The frame tree structure of the current page.
268 FrameTree frame_tree_; 268 std::unique_ptr<FrameTree> frame_tree_;
269 269
270 // The IDs for the Render[View|Process]Host hidden by this interstitial. 270 // The IDs for the Render[View|Process]Host hidden by this interstitial.
271 int original_child_id_; 271 int original_child_id_;
272 int original_rvh_id_; 272 int original_rvh_id_;
273 273
274 // Whether or not we should change the title of the contents when hidden (to 274 // Whether or not we should change the title of the contents when hidden (to
275 // revert it to its original value). 275 // revert it to its original value).
276 bool should_revert_web_contents_title_; 276 bool should_revert_web_contents_title_;
277 277
278 // Whether the ResourceDispatcherHost has been notified to cancel/resume the 278 // Whether the ResourceDispatcherHost has been notified to cancel/resume the
(...skipping 22 matching lines...) Expand all
301 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 301 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
302 302
303 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 303 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
304 304
305 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 305 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
306 }; 306 };
307 307
308 } // namespace content 308 } // namespace content
309 309
310 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 310 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698