diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 02:04:46 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 02:04:46 +0000 |
| commit | 319f8fda34f8f9915e04ea1797d7d1ba8e118d00 (patch) | |
| tree | 5e6907dbbd6acee45804a9d4a58dab74deeb8eec | |
| parent | 99c49b5163449f06c51773cb70646270a6695181 (diff) | |
| download | chromium_src-319f8fda34f8f9915e04ea1797d7d1ba8e118d00.zip chromium_src-319f8fda34f8f9915e04ea1797d7d1ba8e118d00.tar.gz chromium_src-319f8fda34f8f9915e04ea1797d7d1ba8e118d00.tar.bz2 | |
cocoa/bookmarks: Do not rely on Browser::tabstrip_model() accessor.
This simplifies BookmarkAllTabsController::UpdateActiveTabPairs() function.
R=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10270004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134855 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 82a4765..2de8c1b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -44,13 +44,10 @@ using content::WebContents; - (void)UpdateActiveTabPairs { activeTabPairsVector_.clear(); Browser* browser = BrowserList::GetLastActive(); - TabStripModel* tabstrip_model = browser->tabstrip_model(); - const int tabCount = tabstrip_model->count(); + const int tabCount = browser->tab_count(); for (int i = 0; i < tabCount; ++i) { - WebContents* wc = tabstrip_model->GetTabContentsAt(i)->web_contents(); - const string16 tabTitle = wc->GetTitle(); - const GURL& tabURL(wc->GetURL()); - ActiveTabNameURLPair tabPair(tabTitle, tabURL); + WebContents* contents = browser->GetWebContentsAt(i); + ActiveTabNameURLPair tabPair(contents->GetTitle(), contents->GetURL()); activeTabPairsVector_.push_back(tabPair); } } |