content/browser/web_contents/web_contents_impl.h - Issue 25434002: Don't leave renderer process frozen when canceling JavaScript dialogs.

Side by Side Diff: content/browser/web_contents/web_contents_impl.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: Initial patch 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

« chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc ('K') | « content/browser/web_contents/render_view_host_manager.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_WEB_CONTENTS_IMPL_H_	5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

7	7

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10 #include <string>	10 #include <string>

(...skipping 475 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
486 // RenderViewHostManager::Delegate -------------------------------------------	486 // RenderViewHostManager::Delegate -------------------------------------------

487	487

488 virtual bool CreateRenderViewForRenderManager(	488 virtual bool CreateRenderViewForRenderManager(

489 RenderViewHost* render_view_host, int opener_route_id) OVERRIDE;	489 RenderViewHost* render_view_host, int opener_route_id) OVERRIDE;

490 virtual void BeforeUnloadFiredFromRenderManager(	490 virtual void BeforeUnloadFiredFromRenderManager(

491 bool proceed, const base::TimeTicks& proceed_time,	491 bool proceed, const base::TimeTicks& proceed_time,

492 bool* proceed_to_fire_unload) OVERRIDE;	492 bool* proceed_to_fire_unload) OVERRIDE;

493 virtual void RenderProcessGoneFromRenderManager(	493 virtual void RenderProcessGoneFromRenderManager(

494 RenderViewHost* render_view_host) OVERRIDE;	494 RenderViewHost* render_view_host) OVERRIDE;

495 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE;	495 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE;

	496 virtual void CancelModalDialogsForRenderManager() OVERRIDE;

496 virtual void NotifySwappedFromRenderManager(	497 virtual void NotifySwappedFromRenderManager(

497 RenderViewHost* old_render_view_host) OVERRIDE;	498 RenderViewHost* old_render_view_host) OVERRIDE;

498 virtual int CreateOpenerRenderViewsForRenderManager(	499 virtual int CreateOpenerRenderViewsForRenderManager(

499 SiteInstance* instance) OVERRIDE;	500 SiteInstance* instance) OVERRIDE;

500 virtual NavigationControllerImpl&	501 virtual NavigationControllerImpl&

501 GetControllerForRenderManager() OVERRIDE;	502 GetControllerForRenderManager() OVERRIDE;

502 virtual WebUIImpl* CreateWebUIForRenderManager(const GURL& url) OVERRIDE;	503 virtual WebUIImpl* CreateWebUIForRenderManager(const GURL& url) OVERRIDE;

503 virtual NavigationEntry*	504 virtual NavigationEntry*

504 GetLastCommittedNavigationEntryForRenderManager() OVERRIDE;	505 GetLastCommittedNavigationEntryForRenderManager() OVERRIDE;

505 virtual bool FocusLocationBarByDefault() OVERRIDE;	506 virtual bool FocusLocationBarByDefault() OVERRIDE;

(...skipping 464 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
970 // Maps the ids of pending image downloads to their callbacks	971 // Maps the ids of pending image downloads to their callbacks

971 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;	972 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;

972 ImageDownloadMap image_download_map_;	973 ImageDownloadMap image_download_map_;

973	974

974 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);	975 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);

975 };	976 };

976	977

977 } // namespace content	978 } // namespace content

978	979

979 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	980 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

OLD	NEW