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/ui/cocoa/tabs | |
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/ui/cocoa/tabs')
-rw-r--r-- | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 1b40a00..3c8a5c3 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -29,6 +29,7 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/find_bar/find_manager.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/new_tab_button.h" @@ -1069,7 +1070,7 @@ private: newContents->tab_contents()->DidBecomeSelected(); newContents->view()->RestoreFocus(); - if (newContents->tab_contents()->find_ui_active()) + if (newContents->GetFindManager()->find_ui_active()) browser_->GetFindBarController()->find_bar()->SetFocusAndSelection(); } } |