| 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_client.h" | 5 #include "chrome/browser/instant/instant_client.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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 delegate_->StartCapturingKeyStrokes(); | 162 delegate_->StartCapturingKeyStrokes(); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void InstantClient::StopCapturingKeyStrokes(int page_id) { | 165 void InstantClient::StopCapturingKeyStrokes(int page_id) { |
| 166 if (web_contents()->IsActiveEntry(page_id)) | 166 if (web_contents()->IsActiveEntry(page_id)) |
| 167 delegate_->StopCapturingKeyStrokes(); | 167 delegate_->StopCapturingKeyStrokes(); |
| 168 } | 168 } |
| 169 | 169 |
| 170 void InstantClient::SearchBoxNavigate(int page_id, | 170 void InstantClient::SearchBoxNavigate(int page_id, |
| 171 const GURL& url, | 171 const GURL& url, |
| 172 content::PageTransition transition) { | 172 content::PageTransition transition, |
| 173 WindowOpenDisposition disposition) { |
| 173 if (web_contents()->IsActiveEntry(page_id)) | 174 if (web_contents()->IsActiveEntry(page_id)) |
| 174 delegate_->NavigateToURL(url, transition); | 175 delegate_->NavigateToURL(url, transition, disposition); |
| 175 } | 176 } |
| OLD | NEW |