diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 22:27:24 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 22:27:24 +0000 |
| commit | 9c3188693648303a37a6ac5e2c736e1577307188 (patch) | |
| tree | 3f5f987384e987446687f08110024fbb0d006f34 /chrome/browser/automation | |
| parent | f40630d1ba3e640bb9392b96f2397fcf991b98ab (diff) | |
| download | chromium_src-9c3188693648303a37a6ac5e2c736e1577307188.zip chromium_src-9c3188693648303a37a6ac5e2c736e1577307188.tar.gz chromium_src-9c3188693648303a37a6ac5e2c736e1577307188.tar.bz2 | |
Move find-in-page from TabContents to TabContentsWrapper.
Relanding r73294.
BUG=71097
TEST=Hammer on find-in-page on all platforms. Nothing should crash, break, or have any user-visible change.
Review URL: http://codereview.chromium.org/6246028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider_observers.cc | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 41550d4..3fcdba0 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -78,9 +78,11 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/find_bar/find_manager.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" @@ -527,7 +529,10 @@ void AutomationProvider::SendFindRequest( if (!with_json) { find_in_page_observer_.reset(observer); } - tab_contents->set_current_find_request_id(request_id); + TabContentsWrapper** wrapper = + TabContentsWrapper::property_accessor()->GetProperty( + tab_contents->property_bag()); + (*wrapper)->GetFindManager()->set_current_find_request_id(request_id); tab_contents->render_view_host()->StartFinding( FindInPageNotificationObserver::kFindInPageRequestId, search_string, diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 11d6b43..afb04b05 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -50,6 +50,7 @@ #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/automation_constants.h" |