diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-21 05:36:49 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-21 05:36:49 +0000 |
| commit | d5cef1bb6d1edc220740a4f42888bebfdcc950bf (patch) | |
| tree | c6328af81908c8de88e7b34e88e92d22f598bbdb /chrome/browser/views/bookmark_bar_view.cc | |
| parent | 89ceba9a484f853964e5504f14927a8cf7e72449 (diff) | |
| download | chromium_src-d5cef1bb6d1edc220740a4f42888bebfdcc950bf.zip chromium_src-d5cef1bb6d1edc220740a4f42888bebfdcc950bf.tar.gz chromium_src-d5cef1bb6d1edc220740a4f42888bebfdcc950bf.tar.bz2 | |
Allow multiple toolstrips in an extension.
Review URL: http://codereview.chromium.org/42439
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 8cdfc26..ae6a0de 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -1369,9 +1369,12 @@ bool BookmarkBarView::AddExtensionToolstrips(const ExtensionList* extensions) { bool added_toolstrip = false; for (ExtensionList::const_iterator extension = extensions->begin(); extension != extensions->end(); ++extension) { - if (!(*extension)->toolstrip_url().is_empty()) { - ExtensionToolstrip* view = - new ExtensionToolstrip((*extension)->toolstrip_url(), profile_); + for (std::vector<std::string>::const_iterator toolstrip = + (*extension)->toolstrips().begin(); + toolstrip != (*extension)->toolstrips().end(); ++toolstrip) { + ExtensionToolstrip* view = + new ExtensionToolstrip((*extension)->GetResourceURL(*toolstrip), + profile_); int index = GetBookmarkButtonCount() + num_extension_toolstrips_; AddChildView(index, view); added_toolstrip = true; |