diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 20:11:38 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 20:11:38 +0000 |
| commit | c90c6ca59378d7e86d1a2f28fe96bada35df1508 (patch) | |
| tree | e09032ecfe1b14974733c92d717d094559c67ef5 /chrome/test/ui_test_utils.cc | |
| parent | 8d61f1c281dd3490e482c63eba56f4787acf42f1 (diff) | |
| download | chromium_src-c90c6ca59378d7e86d1a2f28fe96bada35df1508.zip chromium_src-c90c6ca59378d7e86d1a2f28fe96bada35df1508.tar.gz chromium_src-c90c6ca59378d7e86d1a2f28fe96bada35df1508.tar.bz2 | |
Rename the TabContentWrapper pieces to be "TabHelper"s. (Except for the PasswordManager... for now.) Also, just pre-create them up-front. It saves us effort, as they're all going to be eventually created anyway, so being lazy saves us nothing and creates headaches since the rules about what can be lazy differ from feature to feature.
BUG=71097
TEST=zero visible change
Review URL: http://codereview.chromium.org/6480117
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 4712faf..e1ed6564b 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -31,8 +31,8 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/find_bar/find_manager.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" +#include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_action.h" @@ -231,7 +231,7 @@ class FindInPageNotificationObserver : public NotificationObserver { active_match_ordinal_(-1), number_of_matches_(0) { current_find_request_id_ = - parent_tab->GetFindManager()->current_find_request_id(); + parent_tab->find_tab_helper()->current_find_request_id(); registrar_.Add(this, NotificationType::FIND_RESULT_AVAILABLE, Source<TabContents>(parent_tab_->tab_contents())); ui_test_utils::RunMessageLoop(); @@ -633,7 +633,7 @@ void WaitForFocusInBrowser(Browser* browser) { int FindInPage(TabContentsWrapper* tab_contents, const string16& search_string, bool forward, bool match_case, int* ordinal) { tab_contents-> - GetFindManager()->StartFinding(search_string, forward, match_case); + find_tab_helper()->StartFinding(search_string, forward, match_case); FindInPageNotificationObserver observer(tab_contents); if (ordinal) *ordinal = observer.active_match_ordinal(); |