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

Side by Side Diff: chrome/browser/ui/views/external_tab_container_win.cc

Issue 10897034: First part of PAGE_TRANSITION_START_PAGE cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 3 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
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 "chrome/browser/ui/views/external_tab_container_win.h" 5 #include "chrome/browser/ui/views/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 void ExternalTabContainerWin::Navigate(const GURL& url, const GURL& referrer) { 1104 void ExternalTabContainerWin::Navigate(const GURL& url, const GURL& referrer) {
1105 if (!tab_contents_.get()) { 1105 if (!tab_contents_.get()) {
1106 NOTREACHED(); 1106 NOTREACHED();
1107 return; 1107 return;
1108 } 1108 }
1109 1109
1110 TRACE_EVENT_BEGIN_ETW("ExternalTabContainerWin::Navigate", 0, url.spec()); 1110 TRACE_EVENT_BEGIN_ETW("ExternalTabContainerWin::Navigate", 0, url.spec());
1111 1111
1112 tab_contents_->web_contents()->GetController().LoadURL( 1112 tab_contents_->web_contents()->GetController().LoadURL(
1113 url, content::Referrer(referrer, WebKit::WebReferrerPolicyDefault), 1113 url, content::Referrer(referrer, WebKit::WebReferrerPolicyDefault),
1114 content::PAGE_TRANSITION_START_PAGE, std::string()); 1114 content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
1115 } 1115 }
1116 1116
1117 bool ExternalTabContainerWin::OnGoToEntryOffset(int offset) { 1117 bool ExternalTabContainerWin::OnGoToEntryOffset(int offset) {
1118 if (load_requests_via_automation_) { 1118 if (load_requests_via_automation_) {
1119 automation_->Send(new AutomationMsg_RequestGoToHistoryEntryOffset( 1119 automation_->Send(new AutomationMsg_RequestGoToHistoryEntryOffset(
1120 tab_handle_, offset)); 1120 tab_handle_, offset));
1121 return false; 1121 return false;
1122 } 1122 }
1123 1123
1124 return true; 1124 return true;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1271 if (params.disposition == CURRENT_TAB) { 1271 if (params.disposition == CURRENT_TAB) {
1272 DCHECK(route_all_top_level_navigations_); 1272 DCHECK(route_all_top_level_navigations_);
1273 forward_params.disposition = NEW_FOREGROUND_TAB; 1273 forward_params.disposition = NEW_FOREGROUND_TAB;
1274 } 1274 }
1275 WebContents* new_contents = 1275 WebContents* new_contents =
1276 ExternalTabContainerWin::OpenURLFromTab(source, forward_params); 1276 ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
1277 // support only one navigation for a dummy tab before it is killed. 1277 // support only one navigation for a dummy tab before it is killed.
1278 ::DestroyWindow(GetNativeView()); 1278 ::DestroyWindow(GetNativeView());
1279 return new_contents; 1279 return new_contents;
1280 } 1280 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698