| 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_loader.h" | 5 #include "chrome/browser/instant/instant_loader.h" |
| 6 | 6 |
| 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 8 #include "chrome/browser/instant/instant_controller.h" | 8 #include "chrome/browser/instant/instant_controller.h" |
| 9 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h" | 9 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h" |
| 10 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" | 10 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 } | 221 } |
| 222 | 222 |
| 223 void InstantLoader::Submit(const string16& text) { | 223 void InstantLoader::Submit(const string16& text) { |
| 224 client_.Submit(text); | 224 client_.Submit(text); |
| 225 } | 225 } |
| 226 | 226 |
| 227 void InstantLoader::Cancel(const string16& text) { | 227 void InstantLoader::Cancel(const string16& text) { |
| 228 client_.Cancel(text); | 228 client_.Cancel(text); |
| 229 } | 229 } |
| 230 | 230 |
| 231 void InstantLoader::SetOmniboxBounds(const gfx::Rect& bounds) { | 231 void InstantLoader::SetPopupBounds(const gfx::Rect& bounds) { |
| 232 client_.SetOmniboxBounds(bounds); | 232 client_.SetPopupBounds(bounds); |
| 233 } |
| 234 |
| 235 void InstantLoader::SetMarginSize(int start, int end) { |
| 236 client_.SetMarginSize(start, end); |
| 233 } | 237 } |
| 234 | 238 |
| 235 void InstantLoader::SendAutocompleteResults( | 239 void InstantLoader::SendAutocompleteResults( |
| 236 const std::vector<InstantAutocompleteResult>& results) { | 240 const std::vector<InstantAutocompleteResult>& results) { |
| 237 client_.SendAutocompleteResults(results); | 241 client_.SendAutocompleteResults(results); |
| 238 } | 242 } |
| 239 | 243 |
| 240 void InstantLoader::UpOrDownKeyPressed(int count) { | 244 void InstantLoader::UpOrDownKeyPressed(int count) { |
| 241 client_.UpOrDownKeyPressed(count); | 245 client_.UpOrDownKeyPressed(count); |
| 242 } | 246 } |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 content::WebContents* new_contents) { | 383 content::WebContents* new_contents) { |
| 380 DCHECK_EQ(old_contents, contents()); | 384 DCHECK_EQ(old_contents, contents()); |
| 381 CleanupPreviewContents(); | 385 CleanupPreviewContents(); |
| 382 // We release here without deleting so that the caller still has the | 386 // We release here without deleting so that the caller still has the |
| 383 // responsibility for deleting the WebContents. | 387 // responsibility for deleting the WebContents. |
| 384 ignore_result(contents_.release()); | 388 ignore_result(contents_.release()); |
| 385 contents_.reset(new_contents); | 389 contents_.reset(new_contents); |
| 386 SetupPreviewContents(); | 390 SetupPreviewContents(); |
| 387 controller_->SwappedWebContents(); | 391 controller_->SwappedWebContents(); |
| 388 } | 392 } |
| OLD | NEW |