OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 if (preview_contents_->tab_contents()->GetRenderWidgetHostView()) { | 612 if (preview_contents_->tab_contents()->GetRenderWidgetHostView()) { |
613 #if defined(OS_MACOSX) | 613 #if defined(OS_MACOSX) |
614 preview_contents_->tab_contents()->GetRenderWidgetHostView()-> | 614 preview_contents_->tab_contents()->GetRenderWidgetHostView()-> |
615 SetTakesFocusOnlyOnMouseDown(false); | 615 SetTakesFocusOnlyOnMouseDown(false); |
616 registrar_.Remove( | 616 registrar_.Remove( |
617 this, | 617 this, |
618 NotificationType::RENDER_VIEW_HOST_CHANGED, | 618 NotificationType::RENDER_VIEW_HOST_CHANGED, |
619 Source<NavigationController>(&preview_contents_->controller())); | 619 Source<NavigationController>(&preview_contents_->controller())); |
620 #endif | 620 #endif |
621 } | 621 } |
622 preview_contents_->set_delegate(NULL); | 622 preview_contents_->tab_contents()->set_delegate(NULL); |
623 preview_tab_contents_delegate_->Reset(); | 623 preview_tab_contents_delegate_->Reset(); |
624 ready_ = false; | 624 ready_ = false; |
625 } | 625 } |
626 update_bounds_timer_.Stop(); | 626 update_bounds_timer_.Stop(); |
627 return preview_contents_.release(); | 627 return preview_contents_.release(); |
628 } | 628 } |
629 | 629 |
630 bool InstantLoader::ShouldCommitInstantOnMouseUp() { | 630 bool InstantLoader::ShouldCommitInstantOnMouseUp() { |
631 return delegate_->ShouldCommitInstantOnMouseUp(); | 631 return delegate_->ShouldCommitInstantOnMouseUp(); |
632 } | 632 } |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
796 Source<NavigationController>(&preview_contents_->controller())); | 796 Source<NavigationController>(&preview_contents_->controller())); |
797 #endif | 797 #endif |
798 | 798 |
799 registrar_.Add( | 799 registrar_.Add( |
800 this, | 800 this, |
801 NotificationType::NAV_ENTRY_COMMITTED, | 801 NotificationType::NAV_ENTRY_COMMITTED, |
802 Source<NavigationController>(&preview_contents_->controller())); | 802 Source<NavigationController>(&preview_contents_->controller())); |
803 | 803 |
804 preview_contents_->tab_contents()->ShowContents(); | 804 preview_contents_->tab_contents()->ShowContents(); |
805 } | 805 } |
OLD | NEW |