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

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

Issue 9808029: Prepending view-source: does not load the source of the userscript. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Removed extra logging code. 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
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/tab_contents/tab_contents.h" 5 #include "content/browser/tab_contents/tab_contents.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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 void MakeNavigateParams(const NavigationEntryImpl& entry, 193 void MakeNavigateParams(const NavigationEntryImpl& entry,
194 const NavigationControllerImpl& controller, 194 const NavigationControllerImpl& controller,
195 content::WebContentsDelegate* delegate, 195 content::WebContentsDelegate* delegate,
196 NavigationController::ReloadType reload_type, 196 NavigationController::ReloadType reload_type,
197 ViewMsg_Navigate_Params* params) { 197 ViewMsg_Navigate_Params* params) {
198 params->page_id = entry.GetPageID(); 198 params->page_id = entry.GetPageID();
199 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry); 199 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry);
200 params->current_history_list_offset = controller.GetLastCommittedEntryIndex(); 200 params->current_history_list_offset = controller.GetLastCommittedEntryIndex();
201 params->current_history_list_length = controller.GetEntryCount(); 201 params->current_history_list_length = controller.GetEntryCount();
202 params->url = entry.GetURL(); 202 params->url = entry.GetURL();
203 params->virtual_url = entry.GetVirtualURL();
203 params->referrer = entry.GetReferrer(); 204 params->referrer = entry.GetReferrer();
204 params->transition = entry.GetTransitionType(); 205 params->transition = entry.GetTransitionType();
205 params->state = entry.GetContentState(); 206 params->state = entry.GetContentState();
206 params->navigation_type = 207 params->navigation_type =
207 GetNavigationType(controller.GetBrowserContext(), entry, reload_type); 208 GetNavigationType(controller.GetBrowserContext(), entry, reload_type);
208 params->request_time = base::Time::Now(); 209 params->request_time = base::Time::Now();
209 params->extra_headers = entry.extra_headers(); 210 params->extra_headers = entry.extra_headers();
210 params->transferred_request_child_id = 211 params->transferred_request_child_id =
211 entry.transferred_global_request_id().child_id; 212 entry.transferred_global_request_id().child_id;
212 params->transferred_request_request_id = 213 params->transferred_request_request_id =
(...skipping 2349 matching lines...) Expand 10 before | Expand all | Expand 10 after
2562 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 2563 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
2563 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh); 2564 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
2564 // Can be NULL during tests. 2565 // Can be NULL during tests.
2565 if (rwh_view) 2566 if (rwh_view)
2566 rwh_view->SetSize(GetView()->GetContainerSize()); 2567 rwh_view->SetSize(GetView()->GetContainerSize());
2567 } 2568 }
2568 2569
2569 RenderViewHostImpl* TabContents::GetRenderViewHostImpl() { 2570 RenderViewHostImpl* TabContents::GetRenderViewHostImpl() {
2570 return static_cast<RenderViewHostImpl*>(GetRenderViewHost()); 2571 return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
2571 } 2572 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698