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

Side by Side Diff: content/browser/tab_contents/tab_contents.cc

Issue 8934011: Rename IntentsHost -> WebIntentsDispatcher and IntentsDispatcher -> WebIntentsHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 9 years 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 | « content/browser/intents/web_intents_dispatcher_impl.cc ('k') | content/content_browser.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tab_contents/tab_contents.h" 5 #include "content/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/metrics/stats_counters.h" 11 #include "base/metrics/stats_counters.h"
12 #include "base/string16.h" 12 #include "base/string16.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "content/browser/child_process_security_policy.h" 16 #include "content/browser/child_process_security_policy.h"
17 #include "content/browser/debugger/devtools_manager_impl.h" 17 #include "content/browser/debugger/devtools_manager_impl.h"
18 #include "content/browser/download/download_stats.h" 18 #include "content/browser/download/download_stats.h"
19 #include "content/browser/host_zoom_map.h" 19 #include "content/browser/host_zoom_map.h"
20 #include "content/browser/in_process_webkit/session_storage_namespace.h" 20 #include "content/browser/in_process_webkit/session_storage_namespace.h"
21 #include "content/browser/intents/intents_host_impl.h" 21 #include "content/browser/intents/web_intents_dispatcher_impl.h"
22 #include "content/browser/load_from_memory_cache_details.h" 22 #include "content/browser/load_from_memory_cache_details.h"
23 #include "content/browser/load_notification_details.h" 23 #include "content/browser/load_notification_details.h"
24 #include "content/browser/renderer_host/render_process_host_impl.h" 24 #include "content/browser/renderer_host/render_process_host_impl.h"
25 #include "content/browser/renderer_host/render_view_host.h" 25 #include "content/browser/renderer_host/render_view_host.h"
26 #include "content/browser/renderer_host/render_widget_host_view.h" 26 #include "content/browser/renderer_host/render_widget_host_view.h"
27 #include "content/browser/renderer_host/resource_dispatcher_host.h" 27 #include "content/browser/renderer_host/resource_dispatcher_host.h"
28 #include "content/browser/renderer_host/resource_request_details.h" 28 #include "content/browser/renderer_host/resource_request_details.h"
29 #include "content/browser/site_instance.h" 29 #include "content/browser/site_instance.h"
30 #include "content/browser/tab_contents/interstitial_page.h" 30 #include "content/browser/tab_contents/interstitial_page.h"
31 #include "content/browser/tab_contents/navigation_details.h" 31 #include "content/browser/tab_contents/navigation_details.h"
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 const string16& type, 919 const string16& type,
920 const string16& href, 920 const string16& href,
921 const string16& title, 921 const string16& title,
922 const string16& disposition) { 922 const string16& disposition) {
923 delegate_->RegisterIntentHandler( 923 delegate_->RegisterIntentHandler(
924 this, action, type, href, title, disposition); 924 this, action, type, href, title, disposition);
925 } 925 }
926 926
927 void TabContents::OnWebIntentDispatch(const webkit_glue::WebIntentData& intent, 927 void TabContents::OnWebIntentDispatch(const webkit_glue::WebIntentData& intent,
928 int intent_id) { 928 int intent_id) {
929 IntentsHostImpl* intents_host = new IntentsHostImpl(this, intent, intent_id); 929 WebIntentsDispatcherImpl* intents_dispatcher =
930 delegate_->WebIntentDispatch(this, intents_host); 930 new WebIntentsDispatcherImpl(this, intent, intent_id);
931 delegate_->WebIntentDispatch(this, intents_dispatcher);
931 } 932 }
932 933
933 void TabContents::OnDidStartProvisionalLoadForFrame(int64 frame_id, 934 void TabContents::OnDidStartProvisionalLoadForFrame(int64 frame_id,
934 bool is_main_frame, 935 bool is_main_frame,
935 const GURL& opener_url, 936 const GURL& opener_url,
936 const GURL& url) { 937 const GURL& url) {
937 bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL); 938 bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL);
938 GURL validated_url(url); 939 GURL validated_url(url);
939 GetRenderViewHost()->FilterURL(ChildProcessSecurityPolicy::GetInstance(), 940 GetRenderViewHost()->FilterURL(ChildProcessSecurityPolicy::GetInstance(),
940 GetRenderProcessHost()->GetID(), &validated_url); 941 GetRenderProcessHost()->GetID(), &validated_url);
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh); 2097 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
2097 // Can be NULL during tests. 2098 // Can be NULL during tests.
2098 if (rwh_view) 2099 if (rwh_view)
2099 rwh_view->SetSize(GetView()->GetContainerSize()); 2100 rwh_view->SetSize(GetView()->GetContainerSize());
2100 } 2101 }
2101 2102
2102 bool TabContents::GotResponseToLockMouseRequest(bool allowed) { 2103 bool TabContents::GotResponseToLockMouseRequest(bool allowed) {
2103 return GetRenderViewHost() ? 2104 return GetRenderViewHost() ?
2104 GetRenderViewHost()->GotResponseToLockMouseRequest(allowed) : false; 2105 GetRenderViewHost()->GotResponseToLockMouseRequest(allowed) : false;
2105 } 2106 }
OLDNEW
« no previous file with comments | « content/browser/intents/web_intents_dispatcher_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698