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

Side by Side Diff: content/browser/frame_host/render_view_host_manager.cc

Issue 49823002: Move navigation and frame tree classes to a new frame_host/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing gyp and adding TODO. Created 7 years, 1 month 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 #include "content/browser/web_contents/render_view_host_manager.h" 5 #include "content/browser/frame_host/render_view_host_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "content/browser/devtools/render_view_devtools_agent_host.h" 12 #include "content/browser/devtools/render_view_devtools_agent_host.h"
13 #include "content/browser/frame_host/interstitial_page_impl.h"
14 #include "content/browser/frame_host/navigation_controller_impl.h"
15 #include "content/browser/frame_host/navigation_entry_impl.h"
13 #include "content/browser/renderer_host/render_process_host_impl.h" 16 #include "content/browser/renderer_host/render_process_host_impl.h"
14 #include "content/browser/renderer_host/render_view_host_factory.h" 17 #include "content/browser/renderer_host/render_view_host_factory.h"
15 #include "content/browser/renderer_host/render_view_host_impl.h" 18 #include "content/browser/renderer_host/render_view_host_impl.h"
16 #include "content/browser/site_instance_impl.h" 19 #include "content/browser/site_instance_impl.h"
17 #include "content/browser/web_contents/interstitial_page_impl.h"
18 #include "content/browser/web_contents/navigation_controller_impl.h"
19 #include "content/browser/web_contents/navigation_entry_impl.h"
20 #include "content/browser/webui/web_ui_controller_factory_registry.h" 20 #include "content/browser/webui/web_ui_controller_factory_registry.h"
21 #include "content/browser/webui/web_ui_impl.h" 21 #include "content/browser/webui/web_ui_impl.h"
22 #include "content/common/view_messages.h" 22 #include "content/common/view_messages.h"
23 #include "content/port/browser/render_widget_host_view_port.h" 23 #include "content/port/browser/render_widget_host_view_port.h"
24 #include "content/public/browser/content_browser_client.h" 24 #include "content/public/browser/content_browser_client.h"
25 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
26 #include "content/public/browser/notification_types.h" 26 #include "content/public/browser/notification_types.h"
27 #include "content/public/browser/render_widget_host_iterator.h" 27 #include "content/public/browser/render_widget_host_iterator.h"
28 #include "content/public/browser/user_metrics.h" 28 #include "content/public/browser/user_metrics.h"
29 #include "content/public/browser/web_contents_view.h"
30 #include "content/public/browser/web_ui_controller.h" 29 #include "content/public/browser/web_ui_controller.h"
31 #include "content/public/common/content_switches.h" 30 #include "content/public/common/content_switches.h"
32 #include "content/public/common/url_constants.h" 31 #include "content/public/common/url_constants.h"
33 32
34 namespace content { 33 namespace content {
35 34
36 RenderViewHostManager::PendingNavigationParams::PendingNavigationParams() 35 RenderViewHostManager::PendingNavigationParams::PendingNavigationParams()
37 : is_transfer(false), frame_id(-1) { 36 : is_transfer(false), frame_id(-1) {
38 } 37 }
39 38
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost( 1083 RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost(
1085 SiteInstance* instance) { 1084 SiteInstance* instance) {
1086 RenderViewHostMap::iterator iter = swapped_out_hosts_.find(instance->GetId()); 1085 RenderViewHostMap::iterator iter = swapped_out_hosts_.find(instance->GetId());
1087 if (iter != swapped_out_hosts_.end()) 1086 if (iter != swapped_out_hosts_.end())
1088 return iter->second; 1087 return iter->second;
1089 1088
1090 return NULL; 1089 return NULL;
1091 } 1090 }
1092 1091
1093 } // namespace content 1092 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_view_host_manager.h ('k') | content/browser/frame_host/render_view_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698