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

Side by Side Diff: content/browser/web_contents/render_view_host_manager.h

Issue 25434002: Don't leave renderer process frozen when canceling JavaScript dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove WebContentsObserver Created 7 years, 2 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 | Annotate | Revision Log
OLDNEW
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_RENDER_VIEW_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // If you are attaching to an already-existing RenderView, you should call 57 // If you are attaching to an already-existing RenderView, you should call
58 // InitWithExistingID. 58 // InitWithExistingID.
59 virtual bool CreateRenderViewForRenderManager( 59 virtual bool CreateRenderViewForRenderManager(
60 RenderViewHost* render_view_host, int opener_route_id) = 0; 60 RenderViewHost* render_view_host, int opener_route_id) = 0;
61 virtual void BeforeUnloadFiredFromRenderManager( 61 virtual void BeforeUnloadFiredFromRenderManager(
62 bool proceed, const base::TimeTicks& proceed_time, 62 bool proceed, const base::TimeTicks& proceed_time,
63 bool* proceed_to_fire_unload) = 0; 63 bool* proceed_to_fire_unload) = 0;
64 virtual void RenderProcessGoneFromRenderManager( 64 virtual void RenderProcessGoneFromRenderManager(
65 RenderViewHost* render_view_host) = 0; 65 RenderViewHost* render_view_host) = 0;
66 virtual void UpdateRenderViewSizeForRenderManager() = 0; 66 virtual void UpdateRenderViewSizeForRenderManager() = 0;
67 virtual void CancelModalDialogsForRenderManager() = 0;
67 virtual void NotifySwappedFromRenderManager( 68 virtual void NotifySwappedFromRenderManager(
68 RenderViewHost* old_render_view_host) = 0; 69 RenderViewHost* old_render_view_host) = 0;
69 virtual NavigationControllerImpl& 70 virtual NavigationControllerImpl&
70 GetControllerForRenderManager() = 0; 71 GetControllerForRenderManager() = 0;
71 72
72 // Create swapped out RenderViews in the given SiteInstance for each tab in 73 // Create swapped out RenderViews in the given SiteInstance for each tab in
73 // the opener chain of this tab, if any. This allows the current tab to 74 // the opener chain of this tab, if any. This allows the current tab to
74 // make cross-process script calls to its opener(s). Returns the route ID 75 // make cross-process script calls to its opener(s). Returns the route ID
75 // of the immediate opener, if one exists (otherwise MSG_ROUTING_NONE). 76 // of the immediate opener, if one exists (otherwise MSG_ROUTING_NONE).
76 virtual int CreateOpenerRenderViewsForRenderManager( 77 virtual int CreateOpenerRenderViewsForRenderManager(
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 InterstitialPageImpl* interstitial_page_; 353 InterstitialPageImpl* interstitial_page_;
353 354
354 NotificationRegistrar registrar_; 355 NotificationRegistrar registrar_;
355 356
356 DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager); 357 DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
357 }; 358 };
358 359
359 } // namespace content 360 } // namespace content
360 361
361 #endif // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ 362 #endif // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | content/browser/web_contents/render_view_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698