OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/instant/instant_tab.h" | 5 #include "chrome/browser/instant/instant_tab.h" |
6 | |
samarth
2013/01/10 21:42:04
nit: leave this line here.
dougw
2013/01/18 23:54:30
Done.
| |
7 #include "chrome/browser/instant/instant_controller.h" | 6 #include "chrome/browser/instant/instant_controller.h" |
8 | 7 |
9 InstantTab::InstantTab(InstantController* controller, | 8 InstantTab::InstantTab(InstantController* controller, |
10 content::WebContents* contents) | 9 content::WebContents* contents) |
11 : client_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 10 : client_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
12 controller_(controller), | 11 controller_(controller), |
13 contents_(contents), | 12 contents_(contents), |
14 supports_instant_(false) { | 13 supports_instant_(false) { |
15 } | 14 } |
16 | 15 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
86 | 85 |
87 void InstantTab::RenderViewGone() { | 86 void InstantTab::RenderViewGone() { |
88 // For a commit page, a crash should not be handled differently. | 87 // For a commit page, a crash should not be handled differently. |
89 } | 88 } |
90 | 89 |
91 void InstantTab::AboutToNavigateMainFrame(const GURL& url) { | 90 void InstantTab::AboutToNavigateMainFrame(const GURL& url) { |
92 // The client is a committed tab, navigations will happen as expected. | 91 // The client is a committed tab, navigations will happen as expected. |
93 } | 92 } |
94 | 93 |
95 void InstantTab::NavigateToURL(const GURL& url, | 94 void InstantTab::NavigateToURL(const GURL& url, |
96 content::PageTransition transition) { | 95 content::PageTransition transition, |
97 controller_->NavigateToURL(url, transition); | 96 WindowOpenDisposition disposition) { |
97 controller_->NavigateToURL(url, transition, disposition); | |
98 } | 98 } |
OLD | NEW |