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

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

Issue 88503002: Have the unload event execute in background on cross-site navigations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added unit tests Created 6 years, 11 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_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 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback.h"
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/logging.h" 14 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/process/kill.h" 16 #include "base/process/kill.h"
16 #include "content/browser/renderer_host/render_widget_host_impl.h" 17 #include "content/browser/renderer_host/render_widget_host_impl.h"
17 #include "content/browser/site_instance_impl.h" 18 #include "content/browser/site_instance_impl.h"
18 #include "content/common/drag_event_source_info.h" 19 #include "content/common/drag_event_source_info.h"
19 #include "content/public/browser/notification_observer.h" 20 #include "content/public/browser/notification_observer.h"
20 #include "content/public/browser/render_view_host.h" 21 #include "content/public/browser/render_view_host.h"
21 #include "content/public/common/javascript_message_type.h" 22 #include "content/public/common/javascript_message_type.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 58
58 namespace content { 59 namespace content {
59 60
60 class BrowserMediaPlayerManager; 61 class BrowserMediaPlayerManager;
61 class ChildProcessSecurityPolicyImpl; 62 class ChildProcessSecurityPolicyImpl;
62 class PageState; 63 class PageState;
63 class RenderWidgetHostDelegate; 64 class RenderWidgetHostDelegate;
64 class SessionStorageNamespace; 65 class SessionStorageNamespace;
65 class SessionStorageNamespaceImpl; 66 class SessionStorageNamespaceImpl;
66 class TestRenderViewHost; 67 class TestRenderViewHost;
68 class TimeoutMonitor;
67 struct ContextMenuParams; 69 struct ContextMenuParams;
68 struct FileChooserParams; 70 struct FileChooserParams;
69 struct Referrer; 71 struct Referrer;
70 struct ShowDesktopNotificationHostMsgParams; 72 struct ShowDesktopNotificationHostMsgParams;
71 73
72 #if defined(COMPILER_MSVC) 74 #if defined(COMPILER_MSVC)
73 // RenderViewHostImpl is the bottom of a diamond-shaped hierarchy, 75 // RenderViewHostImpl is the bottom of a diamond-shaped hierarchy,
74 // with RenderWidgetHost at the root. VS warns when methods from the 76 // with RenderWidgetHost at the root. VS warns when methods from the
75 // root are overridden in only one of the base classes and not both 77 // root are overridden in only one of the base classes and not both
76 // (in this case, RenderWidgetHostImpl provides implementations of 78 // (in this case, RenderWidgetHostImpl provides implementations of
(...skipping 15 matching lines...) Expand all
92 // 94 //
93 // Right now, the concept of page navigation (both top level and frame) exists 95 // Right now, the concept of page navigation (both top level and frame) exists
94 // in the WebContentsImpl still, so if you instantiate one of these elsewhere, 96 // in the WebContentsImpl still, so if you instantiate one of these elsewhere,
95 // you will not be able to traverse pages back and forward. We need to determine 97 // you will not be able to traverse pages back and forward. We need to determine
96 // if we want to bring that and other functionality down into this object so it 98 // if we want to bring that and other functionality down into this object so it
97 // can be shared by others. 99 // can be shared by others.
98 class CONTENT_EXPORT RenderViewHostImpl 100 class CONTENT_EXPORT RenderViewHostImpl
99 : public RenderViewHost, 101 : public RenderViewHost,
100 public RenderWidgetHostImpl { 102 public RenderWidgetHostImpl {
101 public: 103 public:
104 enum RenderViewHostImplState {
nasko 2014/01/23 23:34:58 Having a good comment for each of those states wil
clamy 2014/01/24 17:01:54 Done.
105 RVH_STATE_LIVE = 0,
nasko 2014/01/23 23:34:58 nit: Drop the RVH_ prefix, as this is already acce
clamy 2014/01/24 17:01:54 Done.
106 RVH_STATE_WAITING_FOR_UNLOAD_ACK,
107 RVH_STATE_WAITING_FOR_COMMIT,
108 RVH_STATE_WAITING_FOR_CLOSE,
109 RVH_STATE_PENDING_SWAP_OUT,
110 RVH_STATE_PENDING_SHUTDOWN,
111 RVH_STATE_SWAPPED_OUT,
112 };
113 // Helper function to determine whether the RVH state should contribute to the
114 // number of active views of a SiteInstance or not.
115 static bool IsRVHStateActive(RenderViewHostImplState rvh_state);
116
102 // Convenience function, just like RenderViewHost::FromID. 117 // Convenience function, just like RenderViewHost::FromID.
103 static RenderViewHostImpl* FromID(int render_process_id, int render_view_id); 118 static RenderViewHostImpl* FromID(int render_process_id, int render_view_id);
104 119
105 // |routing_id| could be a valid route id, or it could be MSG_ROUTING_NONE, in 120 // |routing_id| could be a valid route id, or it could be MSG_ROUTING_NONE, in
106 // which case RenderWidgetHost will create a new one. |swapped_out| indicates 121 // which case RenderWidgetHost will create a new one. |swapped_out| indicates
107 // whether the view should initially be swapped out (e.g., for an opener 122 // whether the view should initially be swapped out (e.g., for an opener
108 // frame being rendered by another process). |hidden| indicates whether the 123 // frame being rendered by another process). |hidden| indicates whether the
109 // view is initially hidden or visible. 124 // view is initially hidden or visible.
110 // 125 //
111 // The |session_storage_namespace| parameter allows multiple render views and 126 // The |session_storage_namespace| parameter allows multiple render views and
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 // RenderViewHost. 290 // RenderViewHost.
276 void CancelSuspendedNavigations(); 291 void CancelSuspendedNavigations();
277 292
278 // Whether the initial empty page of this view has been accessed by another 293 // Whether the initial empty page of this view has been accessed by another
279 // page, making it unsafe to show the pending URL. Always false after the 294 // page, making it unsafe to show the pending URL. Always false after the
280 // first commit. 295 // first commit.
281 bool has_accessed_initial_document() { 296 bool has_accessed_initial_document() {
282 return has_accessed_initial_document_; 297 return has_accessed_initial_document_;
283 } 298 }
284 299
285 // Whether this RenderViewHost has been swapped out to be displayed by a 300 // The current state of this RVH.
286 // different process. 301 RenderViewHostImplState rvh_state() const { return rvh_state_; }
287 bool is_swapped_out() const { return is_swapped_out_; }
nasko 2014/01/23 23:34:58 nit: This might be useful method to keep around as
clamy 2014/01/24 17:01:54 Do we want it to return true only for STATE_SWAPPE
nasko 2014/01/27 19:09:51 Based on the replaced usages, it looks that return
clamy 2014/01/28 12:27:21 Done.
288 302
289 // Called on the pending RenderViewHost when the network response is ready to 303 // Called on the pending RenderViewHost when the network response is ready to
290 // commit. We should ensure that the old RenderViewHost runs its unload 304 // commit. We should ensure that the old RenderViewHost runs its unload
291 // handler and determine whether a transfer to a different RenderViewHost is 305 // handler and determine whether a transfer to a different RenderViewHost is
292 // needed. 306 // needed.
293 void OnCrossSiteResponse( 307 void OnCrossSiteResponse(
294 const GlobalRequestID& global_request_id, 308 const GlobalRequestID& global_request_id,
295 bool is_transfer, 309 bool is_transfer,
296 const std::vector<GURL>& transfer_url_chain, 310 const std::vector<GURL>& transfer_url_chain,
297 const Referrer& referrer, 311 const Referrer& referrer,
(...skipping 12 matching lines...) Expand all
310 // a blank document. The renderer should preserve the Frame object until it 324 // a blank document. The renderer should preserve the Frame object until it
311 // exits, in case we come back. The renderer can exit if it has no other 325 // exits, in case we come back. The renderer can exit if it has no other
312 // active RenderViews, but not until WasSwappedOut is called (when it is no 326 // active RenderViews, but not until WasSwappedOut is called (when it is no
313 // longer visible). 327 // longer visible).
314 void SwapOut(); 328 void SwapOut();
315 329
316 // Called when either the SwapOut request has been acknowledged or has timed 330 // Called when either the SwapOut request has been acknowledged or has timed
317 // out. 331 // out.
318 void OnSwappedOut(bool timed_out); 332 void OnSwappedOut(bool timed_out);
319 333
320 // Called to notify the renderer that it has been visibly swapped out and 334 // Called when the RenderFrameHostManager has swapped in a new
321 // replaced by another RenderViewHost, after an earlier call to SwapOut. 335 // RenderFrameHost. Should |this| RVH switch to the pending shutdown state,
322 // It is now safe for the process to exit if there are no other active 336 // |pending_delete_on_swap_out| will be executed upon reception of the
323 // RenderViews. 337 // SwapOutACK, or when the unload timer times out.
324 void WasSwappedOut(); 338 void WasSwappedOut(const base::Closure& pending_delete_on_swap_out);
339
340 // Set |this| as pending shutdown. |on_swap_out| will be called
341 // when the swap out ack is received, or when the unload timer times out.
342 void SetPendingShutdown(const base::Closure& on_swap_out);
325 343
326 // Close the page ignoring whether it has unload events registers. 344 // Close the page ignoring whether it has unload events registers.
327 // This is called after the beforeunload and unload events have fired 345 // This is called after the beforeunload and unload events have fired
328 // and the user has agreed to continue with closing the page. 346 // and the user has agreed to continue with closing the page.
329 void ClosePageIgnoringUnloadEvents(); 347 void ClosePageIgnoringUnloadEvents();
330 348
331 // Returns whether this RenderViewHost has an outstanding cross-site request. 349 // Returns whether this RenderViewHost has an outstanding cross-site request.
332 // Cleared when we hear the response and start to swap out the old 350 // Cleared when we hear the response and start to swap out the old
333 // RenderViewHost, or if we hear a commit here without a network request. 351 // RenderViewHost, or if we hear a commit here without a network request.
334 bool HasPendingCrossSiteRequest(); 352 bool HasPendingCrossSiteRequest();
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 const base::Closure& callback); 466 const base::Closure& callback);
449 void SetAccessibilityLoadCompleteCallbackForTesting( 467 void SetAccessibilityLoadCompleteCallbackForTesting(
450 const base::Closure& callback); 468 const base::Closure& callback);
451 void SetAccessibilityOtherCallbackForTesting( 469 void SetAccessibilityOtherCallbackForTesting(
452 const base::Closure& callback); 470 const base::Closure& callback);
453 471
454 bool is_waiting_for_beforeunload_ack() { 472 bool is_waiting_for_beforeunload_ack() {
455 return is_waiting_for_beforeunload_ack_; 473 return is_waiting_for_beforeunload_ack_;
456 } 474 }
457 475
458 bool is_waiting_for_unload_ack() { 476 // Whether the RVH is waiting for the unload ack from the renderer.
459 return is_waiting_for_unload_ack_; 477 bool IsWaitingForUnloadACK() const;
460 }
461 478
462 // Returns whether the given URL is allowed to commit in the current process. 479 // Returns whether the given URL is allowed to commit in the current process.
463 // This is a more conservative check than RenderProcessHost::FilterURL, since 480 // This is a more conservative check than RenderProcessHost::FilterURL, since
464 // it will be used to kill processes that commit unauthorized URLs. 481 // it will be used to kill processes that commit unauthorized URLs.
465 bool CanCommitURL(const GURL& url); 482 bool CanCommitURL(const GURL& url);
466 483
467 // Update the FrameTree to use this RenderViewHost's main frame 484 // Update the FrameTree to use this RenderViewHost's main frame
468 // RenderFrameHost. Called when the RenderViewHost is committed. 485 // RenderFrameHost. Called when the RenderViewHost is committed.
469 // 486 //
470 // TODO(ajwong): Remove once RenderViewHost no longer owns the main frame 487 // TODO(ajwong): Remove once RenderViewHost no longer owns the main frame
471 // RenderFrameHost. 488 // RenderFrameHost.
472 void AttachToFrameTree(); 489 void AttachToFrameTree();
473 490
474 // The following IPC handlers are public so RenderFrameHost can call them, 491 // The following IPC handlers are public so RenderFrameHost can call them,
475 // while we transition the code to not use RenderViewHost. 492 // while we transition the code to not use RenderViewHost.
476 // 493 //
477 // TODO(nasko): Remove those methods once we are done moving navigation 494 // TODO(nasko): Remove those methods once we are done moving navigation
478 // into RenderFrameHost. 495 // into RenderFrameHost.
479 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 496 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
480 int64 parent_frame_id, 497 int64 parent_frame_id,
481 bool main_frame, 498 bool main_frame,
482 const GURL& url); 499 const GURL& url);
483 500
501 // Increases the refcounting on this RVH. This is done by the FrameTree on
502 // creation of a RenderFrameHost.
503 void increment_ref_count() { ++ref_count_; }
504
505 // Decreases the refcounting on this RVH. This is done by the FrameTree on
506 // destruction of a RenderFrameHost.
507 void decrement_ref_count() { --ref_count_; }
508
509 // Returns the refcount on this RVH, that is the number of RenderFrameHosts
510 // currently using it.
511 int ref_count() { return ref_count_; }
512
484 // NOTE: Do not add functions that just send an IPC message that are called in 513 // NOTE: Do not add functions that just send an IPC message that are called in
485 // one or two places. Have the caller send the IPC message directly (unless 514 // one or two places. Have the caller send the IPC message directly (unless
486 // the caller places are in different platforms, in which case it's better 515 // the caller places are in different platforms, in which case it's better
487 // to keep them consistent). 516 // to keep them consistent).
488 517
489 protected: 518 protected:
490 // RenderWidgetHost protected overrides. 519 // RenderWidgetHost protected overrides.
491 virtual void OnUserGesture() OVERRIDE; 520 virtual void OnUserGesture() OVERRIDE;
492 virtual void NotifyRendererUnresponsive() OVERRIDE; 521 virtual void NotifyRendererUnresponsive() OVERRIDE;
493 virtual void NotifyRendererResponsive() OVERRIDE; 522 virtual void NotifyRendererResponsive() OVERRIDE;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 619
591 #if defined(OS_MACOSX) || defined(OS_ANDROID) 620 #if defined(OS_MACOSX) || defined(OS_ANDROID)
592 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); 621 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params);
593 #endif 622 #endif
594 623
595 private: 624 private:
596 friend class TestRenderViewHost; 625 friend class TestRenderViewHost;
597 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost); 626 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost);
598 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane); 627 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane);
599 628
600 // Sets whether this RenderViewHost is swapped out in favor of another, 629 // Updates the state of this RenderViewHost and clears any waiting state
601 // and clears any waiting state that is no longer relevant. 630 // that is no longer relevant.
602 void SetSwappedOut(bool is_swapped_out); 631 void SetRVHState(RenderViewHostImplState rvh_state);
nasko 2014/01/23 23:34:58 nit: Why not just SetState? The method is already
clamy 2014/01/24 17:01:54 Done.
603 632
604 bool CanAccessFilesOfPageState(const PageState& state) const; 633 bool CanAccessFilesOfPageState(const PageState& state) const;
605 634
635 // The number of RenderFrameHost which have a pointer to this RVH.
nasko 2014/01/23 23:34:58 nit: s/pointer/reference/
clamy 2014/01/24 17:01:54 Done.
636 int ref_count_;
nasko 2014/01/23 23:34:58 The name implies generic ref count, which this isn
clamy 2014/01/24 17:01:54 Done.
637
606 // Our delegate, which wants to know about changes in the RenderView. 638 // Our delegate, which wants to know about changes in the RenderView.
607 RenderViewHostDelegate* delegate_; 639 RenderViewHostDelegate* delegate_;
608 640
609 // The SiteInstance associated with this RenderViewHost. All pages drawn 641 // The SiteInstance associated with this RenderViewHost. All pages drawn
610 // in this RenderViewHost are part of this SiteInstance. Should not change 642 // in this RenderViewHost are part of this SiteInstance. Should not change
611 // over time. 643 // over time.
612 scoped_refptr<SiteInstanceImpl> instance_; 644 scoped_refptr<SiteInstanceImpl> instance_;
613 645
614 // true if we are currently waiting for a response for drag context 646 // true if we are currently waiting for a response for drag context
615 // information. 647 // information.
(...skipping 14 matching lines...) Expand all
630 // navigation, because WebContentsImpl will destroy the pending RVH and create 662 // navigation, because WebContentsImpl will destroy the pending RVH and create
631 // a new one if a second navigation occurs. 663 // a new one if a second navigation occurs.
632 scoped_ptr<ViewMsg_Navigate_Params> suspended_nav_params_; 664 scoped_ptr<ViewMsg_Navigate_Params> suspended_nav_params_;
633 665
634 // Whether the initial empty page of this view has been accessed by another 666 // Whether the initial empty page of this view has been accessed by another
635 // page, making it unsafe to show the pending URL. Usually false unless 667 // page, making it unsafe to show the pending URL. Usually false unless
636 // another window tries to modify the blank page. Always false after the 668 // another window tries to modify the blank page. Always false after the
637 // first commit. 669 // first commit.
638 bool has_accessed_initial_document_; 670 bool has_accessed_initial_document_;
639 671
640 // Whether this RenderViewHost is currently swapped out, such that the view is 672 // The current state of this RVH.
641 // being rendered by another process. 673 RenderViewHostImplState rvh_state_;
642 bool is_swapped_out_;
643 674
644 // The frame id of the main (top level) frame. This value is set on the 675 // The frame id of the main (top level) frame. This value is set on the
645 // initial navigation of a RenderView and reset when the RenderView's 676 // initial navigation of a RenderView and reset when the RenderView's
646 // process is terminated (in RenderProcessGone). 677 // process is terminated (in RenderProcessGone).
647 // TODO(creis): Remove this when we switch to routing IDs for frames. 678 // TODO(creis): Remove this when we switch to routing IDs for frames.
648 int64 main_frame_id_; 679 int64 main_frame_id_;
649 680
650 // Routing ID for the main frame's RenderFrameHost. 681 // Routing ID for the main frame's RenderFrameHost.
651 int main_frame_routing_id_; 682 int main_frame_routing_id_;
652 683
653 // If we were asked to RunModal, then this will hold the reply_msg that we 684 // If we were asked to RunModal, then this will hold the reply_msg that we
654 // must return to the renderer to unblock it. 685 // must return to the renderer to unblock it.
655 IPC::Message* run_modal_reply_msg_; 686 IPC::Message* run_modal_reply_msg_;
656 // This will hold the routing id of the RenderView that opened us. 687 // This will hold the routing id of the RenderView that opened us.
657 int run_modal_opener_id_; 688 int run_modal_opener_id_;
658 689
659 // Set to true when there is a pending ViewMsg_ShouldClose message. This 690 // Set to true when there is a pending ViewMsg_ShouldClose message. This
660 // ensures we don't spam the renderer with multiple beforeunload requests. 691 // ensures we don't spam the renderer with multiple beforeunload requests.
661 // When either this value or is_waiting_for_unload_ack_ is true, the value of 692 // When either this value or IsWaitingForUnloadACK is true, the value of
662 // unload_ack_is_for_cross_site_transition_ indicates whether this is for a 693 // unload_ack_is_for_cross_site_transition_ indicates whether this is for a
663 // cross-site transition or a tab close attempt. 694 // cross-site transition or a tab close attempt.
664 bool is_waiting_for_beforeunload_ack_; 695 bool is_waiting_for_beforeunload_ack_;
665 696
666 // Set to true when there is a pending ViewMsg_Close message. Also see
667 // is_waiting_for_beforeunload_ack_, unload_ack_is_for_cross_site_transition_.
668 bool is_waiting_for_unload_ack_;
669
670 // Set to true when waiting for ViewHostMsg_SwapOut_ACK has timed out.
671 bool has_timed_out_on_unload_;
672
673 // Valid only when is_waiting_for_beforeunload_ack_ or 697 // Valid only when is_waiting_for_beforeunload_ack_ or
674 // is_waiting_for_unload_ack_ is true. This tells us if the unload request 698 // IsWaitingForUnloadACK is true. This tells us if the unload request
675 // is for closing the entire tab ( = false), or only this RenderViewHost in 699 // is for closing the entire tab ( = false), or only this RenderViewHost in
676 // the case of a cross-site transition ( = true). 700 // the case of a cross-site transition ( = true).
677 bool unload_ack_is_for_cross_site_transition_; 701 bool unload_ack_is_for_cross_site_transition_;
678 702
679 bool are_javascript_messages_suppressed_; 703 bool are_javascript_messages_suppressed_;
680 704
681 // The mapping of pending javascript calls created by 705 // The mapping of pending javascript calls created by
682 // ExecuteJavascriptInWebFrameCallbackResult and their corresponding 706 // ExecuteJavascriptInWebFrameCallbackResult and their corresponding
683 // callbacks. 707 // callbacks.
684 std::map<int, JavascriptResultCallback> javascript_callbacks_; 708 std::map<int, JavascriptResultCallback> javascript_callbacks_;
(...skipping 14 matching lines...) Expand all
699 base::TimeTicks send_should_close_start_time_; 723 base::TimeTicks send_should_close_start_time_;
700 724
701 // Set to true if we requested the on screen keyboard to be displayed. 725 // Set to true if we requested the on screen keyboard to be displayed.
702 bool virtual_keyboard_requested_; 726 bool virtual_keyboard_requested_;
703 727
704 #if defined(OS_ANDROID) 728 #if defined(OS_ANDROID)
705 // Manages all the android mediaplayer objects and handling IPCs for video. 729 // Manages all the android mediaplayer objects and handling IPCs for video.
706 scoped_ptr<BrowserMediaPlayerManager> media_player_manager_; 730 scoped_ptr<BrowserMediaPlayerManager> media_player_manager_;
707 #endif 731 #endif
708 732
733 // Used to shutdown this RVH when the unload event is taking too long to
734 // execute.
735 scoped_ptr<TimeoutMonitor> unload_event_monitor_timeout_;
736
737 // Called after receiving the swap out ack when the RVH is in state pending
738 // shutdown. Also called if the unload timer times out.
739 base::Closure pending_shutdown_on_swap_out_;
740
741 base::WeakPtrFactory<RenderViewHostImpl> weak_factory_;
742
709 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 743 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
710 }; 744 };
711 745
712 #if defined(COMPILER_MSVC) 746 #if defined(COMPILER_MSVC)
713 #pragma warning(pop) 747 #pragma warning(pop)
714 #endif 748 #endif
715 749
716 } // namespace content 750 } // namespace content
717 751
718 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 752 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698