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

Side by Side Diff: chrome/browser/tab_contents/render_view_host_manager.h

Issue 155157: Revert r19752 (Closed)
Patch Set: pre CR Created 11 years, 5 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 (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "chrome/browser/renderer_host/render_view_host.h" 10 #include "chrome/browser/renderer_host/render_view_host.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // have an associated DOM UI, in which case the DOM UI pointer will be non- 237 // have an associated DOM UI, in which case the DOM UI pointer will be non-
238 // NULL. 238 // NULL.
239 // 239 //
240 // The pending_dom_ui may be non-NULL even when the pending_render_view_host_ 240 // The pending_dom_ui may be non-NULL even when the pending_render_view_host_
241 // is. This will happen when we're transitioning between two DOM UI pages: 241 // is. This will happen when we're transitioning between two DOM UI pages:
242 // the RVH won't be swapped, so the pending pointer will be unused, but there 242 // the RVH won't be swapped, so the pending pointer will be unused, but there
243 // will be a pending DOM UI associated with the navigation. 243 // will be a pending DOM UI associated with the navigation.
244 RenderViewHost* pending_render_view_host_; 244 RenderViewHost* pending_render_view_host_;
245 scoped_ptr<DOMUI> pending_dom_ui_; 245 scoped_ptr<DOMUI> pending_dom_ui_;
246 246
247 // Records whether the navigation was cancelled, but we are leaving the
248 // pending_render_view_host_ around in consideration of the download system.
249 bool pending_renderer_aborted_;
250
251 // The intersitial page currently shown if any, not own by this class 247 // The intersitial page currently shown if any, not own by this class
252 // (the InterstitialPage is self-owned, it deletes itself when hidden). 248 // (the InterstitialPage is self-owned, it deletes itself when hidden).
253 InterstitialPage* interstitial_page_; 249 InterstitialPage* interstitial_page_;
254 250
255 NotificationRegistrar registrar_; 251 NotificationRegistrar registrar_;
256 252
257 DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager); 253 DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
258 }; 254 };
259 255
260 // The "details" for a NOTIFY_RENDER_VIEW_HOST_CHANGED notification. The old 256 // The "details" for a NOTIFY_RENDER_VIEW_HOST_CHANGED notification. The old
261 // host can be NULL when the first RenderViewHost is set. 257 // host can be NULL when the first RenderViewHost is set.
262 struct RenderViewHostSwitchedDetails { 258 struct RenderViewHostSwitchedDetails {
263 RenderViewHost* old_host; 259 RenderViewHost* old_host;
264 RenderViewHost* new_host; 260 RenderViewHost* new_host;
265 }; 261 };
266 262
267 #endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 263 #endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698