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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 10392060: Disable the hang dialog detector when showModalDialog is running. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/render_view_host_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 (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_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 virtual void OnMsgFocus() OVERRIDE; 431 virtual void OnMsgFocus() OVERRIDE;
432 virtual void OnMsgBlur() OVERRIDE; 432 virtual void OnMsgBlur() OVERRIDE;
433 433
434 // IPC message handlers. 434 // IPC message handlers.
435 void OnMsgShowView(int route_id, 435 void OnMsgShowView(int route_id,
436 WindowOpenDisposition disposition, 436 WindowOpenDisposition disposition,
437 const gfx::Rect& initial_pos, 437 const gfx::Rect& initial_pos,
438 bool user_gesture); 438 bool user_gesture);
439 void OnMsgShowWidget(int route_id, const gfx::Rect& initial_pos); 439 void OnMsgShowWidget(int route_id, const gfx::Rect& initial_pos);
440 void OnMsgShowFullscreenWidget(int route_id); 440 void OnMsgShowFullscreenWidget(int route_id);
441 void OnMsgRunModal(IPC::Message* reply_msg); 441 void OnMsgRunModal(int opener_id, IPC::Message* reply_msg);
442 void OnMsgRenderViewReady(); 442 void OnMsgRenderViewReady();
443 void OnMsgRenderViewGone(int status, int error_code); 443 void OnMsgRenderViewGone(int status, int error_code);
444 void OnMsgDidStartProvisionalLoadForFrame(int64 frame_id, 444 void OnMsgDidStartProvisionalLoadForFrame(int64 frame_id,
445 bool main_frame, 445 bool main_frame,
446 const GURL& opener_url, 446 const GURL& opener_url,
447 const GURL& url); 447 const GURL& url);
448 void OnMsgDidRedirectProvisionalLoad(int32 page_id, 448 void OnMsgDidRedirectProvisionalLoad(int32 page_id,
449 const GURL& opener_url, 449 const GURL& opener_url,
450 const GURL& source_url, 450 const GURL& source_url,
451 const GURL& target_url); 451 const GURL& target_url);
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 // second navigation occurs. 581 // second navigation occurs.
582 scoped_ptr<ViewMsg_Navigate> suspended_nav_message_; 582 scoped_ptr<ViewMsg_Navigate> suspended_nav_message_;
583 583
584 // Whether this RenderViewHost is currently swapped out, such that the view is 584 // Whether this RenderViewHost is currently swapped out, such that the view is
585 // being rendered by another process. 585 // being rendered by another process.
586 bool is_swapped_out_; 586 bool is_swapped_out_;
587 587
588 // If we were asked to RunModal, then this will hold the reply_msg that we 588 // If we were asked to RunModal, then this will hold the reply_msg that we
589 // must return to the renderer to unblock it. 589 // must return to the renderer to unblock it.
590 IPC::Message* run_modal_reply_msg_; 590 IPC::Message* run_modal_reply_msg_;
591 // This will hold the routing id of the RenderView that opened us.
592 int run_modal_opener_id_;
591 593
592 // Set to true when there is a pending ViewMsg_ShouldClose message. This 594 // Set to true when there is a pending ViewMsg_ShouldClose message. This
593 // ensures we don't spam the renderer with multiple beforeunload requests. 595 // ensures we don't spam the renderer with multiple beforeunload requests.
594 // When either this value or is_waiting_for_unload_ack_ is true, the value of 596 // When either this value or is_waiting_for_unload_ack_ is true, the value of
595 // unload_ack_is_for_cross_site_transition_ indicates whether this is for a 597 // unload_ack_is_for_cross_site_transition_ indicates whether this is for a
596 // cross-site transition or a tab close attempt. 598 // cross-site transition or a tab close attempt.
597 bool is_waiting_for_beforeunload_ack_; 599 bool is_waiting_for_beforeunload_ack_;
598 600
599 // Set to true when there is a pending ViewMsg_Close message. Also see 601 // Set to true when there is a pending ViewMsg_Close message. Also see
600 // is_waiting_for_beforeunload_ack_, unload_ack_is_for_cross_site_transition_. 602 // is_waiting_for_beforeunload_ack_, unload_ack_is_for_cross_site_transition_.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 643 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
642 }; 644 };
643 645
644 #if defined(COMPILER_MSVC) 646 #if defined(COMPILER_MSVC)
645 #pragma warning(pop) 647 #pragma warning(pop)
646 #endif 648 #endif
647 649
648 } // namespace content 650 } // namespace content
649 651
650 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 652 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698