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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10091023: content: Move more two url constants to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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/public/common/url_constants.h » ('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 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.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/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 int intent_id) { 1447 int intent_id) {
1448 WebIntentsDispatcherImpl* intents_dispatcher = 1448 WebIntentsDispatcherImpl* intents_dispatcher =
1449 new WebIntentsDispatcherImpl(this, intent, intent_id); 1449 new WebIntentsDispatcherImpl(this, intent, intent_id);
1450 delegate_->WebIntentDispatch(this, intents_dispatcher); 1450 delegate_->WebIntentDispatch(this, intents_dispatcher);
1451 } 1451 }
1452 1452
1453 void WebContentsImpl::OnDidStartProvisionalLoadForFrame(int64 frame_id, 1453 void WebContentsImpl::OnDidStartProvisionalLoadForFrame(int64 frame_id,
1454 bool is_main_frame, 1454 bool is_main_frame,
1455 const GURL& opener_url, 1455 const GURL& opener_url,
1456 const GURL& url) { 1456 const GURL& url) {
1457 bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL); 1457 bool is_error_page = (url.spec() == content::kUnreachableWebDataURL);
1458 GURL validated_url(url); 1458 GURL validated_url(url);
1459 GURL validated_opener_url(opener_url); 1459 GURL validated_opener_url(opener_url);
1460 GetRenderViewHostImpl()->FilterURL( 1460 GetRenderViewHostImpl()->FilterURL(
1461 ChildProcessSecurityPolicyImpl::GetInstance(), 1461 ChildProcessSecurityPolicyImpl::GetInstance(),
1462 GetRenderProcessHost()->GetID(), 1462 GetRenderProcessHost()->GetID(),
1463 false, 1463 false,
1464 &validated_url); 1464 &validated_url);
1465 GetRenderViewHostImpl()->FilterURL( 1465 GetRenderViewHostImpl()->FilterURL(
1466 ChildProcessSecurityPolicyImpl::GetInstance(), 1466 ChildProcessSecurityPolicyImpl::GetInstance(),
1467 GetRenderProcessHost()->GetID(), 1467 GetRenderProcessHost()->GetID(),
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after
2623 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 2623 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
2624 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh); 2624 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
2625 // Can be NULL during tests. 2625 // Can be NULL during tests.
2626 if (rwh_view) 2626 if (rwh_view)
2627 rwh_view->SetSize(GetView()->GetContainerSize()); 2627 rwh_view->SetSize(GetView()->GetContainerSize());
2628 } 2628 }
2629 2629
2630 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() { 2630 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() {
2631 return static_cast<RenderViewHostImpl*>(GetRenderViewHost()); 2631 return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
2632 } 2632 }
OLDNEW
« no previous file with comments | « no previous file | content/public/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698