| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_page.h" | 5 #include "chrome/browser/instant/instant_page.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/common/render_messages.h" | 8 #include "chrome/common/render_messages.h" |
| 9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 void InstantPage::OnStopCapturingKeyStrokes(int page_id) { | 223 void InstantPage::OnStopCapturingKeyStrokes(int page_id) { |
| 224 if (contents()->IsActiveEntry(page_id)) { | 224 if (contents()->IsActiveEntry(page_id)) { |
| 225 OnInstantSupportDetermined(page_id, true); | 225 OnInstantSupportDetermined(page_id, true); |
| 226 if (ShouldProcessStopCapturingKeyStrokes()) | 226 if (ShouldProcessStopCapturingKeyStrokes()) |
| 227 delegate_->StopCapturingKeyStrokes(contents()); | 227 delegate_->StopCapturingKeyStrokes(contents()); |
| 228 } | 228 } |
| 229 } | 229 } |
| 230 | 230 |
| 231 void InstantPage::OnSearchBoxNavigate(int page_id, | 231 void InstantPage::OnSearchBoxNavigate(int page_id, |
| 232 const GURL& url, | 232 const GURL& url, |
| 233 content::PageTransition transition) { | 233 content::PageTransition transition, |
| 234 WindowOpenDisposition disposition) { |
| 234 if (contents()->IsActiveEntry(page_id)) { | 235 if (contents()->IsActiveEntry(page_id)) { |
| 235 OnInstantSupportDetermined(page_id, true); | 236 OnInstantSupportDetermined(page_id, true); |
| 236 if (ShouldProcessNavigateToURL()) | 237 if (ShouldProcessNavigateToURL()) |
| 237 delegate_->NavigateToURL(contents(), url, transition); | 238 delegate_->NavigateToURL(contents(), url, transition, disposition); |
| 238 } | 239 } |
| 239 } | 240 } |
| OLD | NEW |