| 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 void InstantPage::OnStopCapturingKeyStrokes(int page_id) { | 234 void InstantPage::OnStopCapturingKeyStrokes(int page_id) { |
| 235 if (contents()->IsActiveEntry(page_id)) { | 235 if (contents()->IsActiveEntry(page_id)) { |
| 236 OnInstantSupportDetermined(page_id, true); | 236 OnInstantSupportDetermined(page_id, true); |
| 237 if (ShouldProcessStopCapturingKeyStrokes()) | 237 if (ShouldProcessStopCapturingKeyStrokes()) |
| 238 delegate_->StopCapturingKeyStrokes(contents()); | 238 delegate_->StopCapturingKeyStrokes(contents()); |
| 239 } | 239 } |
| 240 } | 240 } |
| 241 | 241 |
| 242 void InstantPage::OnSearchBoxNavigate(int page_id, | 242 void InstantPage::OnSearchBoxNavigate(int page_id, |
| 243 const GURL& url, | 243 const GURL& url, |
| 244 content::PageTransition transition) { | 244 content::PageTransition transition, |
| 245 WindowOpenDisposition disposition) { |
| 245 if (contents()->IsActiveEntry(page_id)) { | 246 if (contents()->IsActiveEntry(page_id)) { |
| 246 OnInstantSupportDetermined(page_id, true); | 247 OnInstantSupportDetermined(page_id, true); |
| 247 if (ShouldProcessNavigateToURL()) | 248 if (ShouldProcessNavigateToURL()) |
| 248 delegate_->NavigateToURL(contents(), url, transition); | 249 delegate_->NavigateToURL(contents(), url, transition, disposition); |
| 249 } | 250 } |
| 250 } | 251 } |
| 251 | 252 |
| 252 void InstantPage::OnDeleteMostVisitedItem(const GURL& url) { | 253 void InstantPage::OnDeleteMostVisitedItem(const GURL& url) { |
| 253 delegate_->DeleteMostVisitedItem(url); | 254 delegate_->DeleteMostVisitedItem(url); |
| 254 } | 255 } |
| 255 | 256 |
| 256 void InstantPage::OnUndoMostVisitedDeletion(const GURL& url) { | 257 void InstantPage::OnUndoMostVisitedDeletion(const GURL& url) { |
| 257 delegate_->UndoMostVisitedDeletion(url); | 258 delegate_->UndoMostVisitedDeletion(url); |
| 258 } | 259 } |
| 259 | 260 |
| 260 void InstantPage::OnUndoAllMostVisitedDeletions() { | 261 void InstantPage::OnUndoAllMostVisitedDeletions() { |
| 261 delegate_->UndoAllMostVisitedDeletions(); | 262 delegate_->UndoAllMostVisitedDeletions(); |
| 262 } | 263 } |
| OLD | NEW |