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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 1180933002: Revert of Ensure the new navigation classifier works in the real world. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/debug/crash_logging.h"
14 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
15 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
16 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
17 #include "base/strings/string_number_conversions.h" // Temporary
18 #include "base/time/time.h" 16 #include "base/time/time.h"
19 #include "content/browser/accessibility/browser_accessibility_manager.h" 17 #include "content/browser/accessibility/browser_accessibility_manager.h"
20 #include "content/browser/site_instance_impl.h" 18 #include "content/browser/site_instance_impl.h"
21 #include "content/common/accessibility_mode_enums.h" 19 #include "content/common/accessibility_mode_enums.h"
22 #include "content/common/content_export.h" 20 #include "content/common/content_export.h"
23 #include "content/common/frame_message_enums.h" 21 #include "content/common/frame_message_enums.h"
24 #include "content/common/frame_replication_state.h" 22 #include "content/common/frame_replication_state.h"
25 #include "content/common/mojo/service_registry_impl.h" 23 #include "content/common/mojo/service_registry_impl.h"
26 #include "content/common/navigation_params.h" 24 #include "content/common/navigation_params.h"
27 #include "content/public/browser/render_frame_host.h" 25 #include "content/public/browser/render_frame_host.h"
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 432
435 // Tears down the browser-side state relating to the Mojo connection between 433 // Tears down the browser-side state relating to the Mojo connection between
436 // this instance and its associated render frame. 434 // this instance and its associated render frame.
437 void InvalidateMojoConnection(); 435 void InvalidateMojoConnection();
438 436
439 // Returns whether the frame is focused. A frame is considered focused when it 437 // Returns whether the frame is focused. A frame is considered focused when it
440 // is the parent chain of the focused frame within the frame tree. In 438 // is the parent chain of the focused frame within the frame tree. In
441 // addition, its associated RenderWidgetHost has to be focused. 439 // addition, its associated RenderWidgetHost has to be focused.
442 bool IsFocused(); 440 bool IsFocused();
443 441
444 // Temporary for http://crbug.com/369661.
445 std::string CommitCountString();
446
447 protected: 442 protected:
448 friend class RenderFrameHostFactory; 443 friend class RenderFrameHostFactory;
449 444
450 // |flags| is a combination of CreateRenderFrameFlags. 445 // |flags| is a combination of CreateRenderFrameFlags.
451 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost 446 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost
452 // should be the abstraction needed here, but we need RenderViewHost to pass 447 // should be the abstraction needed here, but we need RenderViewHost to pass
453 // into WebContentsObserver::FrameDetached for now. 448 // into WebContentsObserver::FrameDetached for now.
454 RenderFrameHostImpl(SiteInstance* site_instance, 449 RenderFrameHostImpl(SiteInstance* site_instance,
455 RenderViewHostImpl* render_view_host, 450 RenderViewHostImpl* render_view_host,
456 RenderFrameHostDelegate* delegate, 451 RenderFrameHostDelegate* delegate,
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 // PlzNavigate: Owns the stream used in navigations to store the body of the 721 // PlzNavigate: Owns the stream used in navigations to store the body of the
727 // response once it has started. 722 // response once it has started.
728 scoped_ptr<StreamHandle> stream_handle_; 723 scoped_ptr<StreamHandle> stream_handle_;
729 724
730 // Context shared for each PermissionService instance created for this RFH. 725 // Context shared for each PermissionService instance created for this RFH.
731 scoped_ptr<PermissionServiceContext> permission_service_context_; 726 scoped_ptr<PermissionServiceContext> permission_service_context_;
732 727
733 // The frame's Mojo Shell service. 728 // The frame's Mojo Shell service.
734 scoped_ptr<FrameMojoShell> frame_mojo_shell_; 729 scoped_ptr<FrameMojoShell> frame_mojo_shell_;
735 730
736 // Temporary for http://crbug.com/369661
737 int commit_count_ = 0;
738
739 // NOTE: This must be the last member. 731 // NOTE: This must be the last member.
740 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 732 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
741 733
742 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 734 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
743 }; 735 };
744 736
745 } // namespace content 737 } // namespace content
746 738
747 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 739 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698