Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: chrome/browser/views/location_bar_view.cc

Issue 327007: Revert 29861 since this fail on the interactive... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/location_bar_view.cc
===================================================================
--- chrome/browser/views/location_bar_view.cc (revision 29866)
+++ chrome/browser/views/location_bar_view.cc (working copy)
@@ -92,7 +92,7 @@
// A container for the PageActionImageView plus its badge.
class LocationBarView::PageActionWithBadgeView : public views::View {
public:
- explicit PageActionWithBadgeView(PageActionImageView* image_view);
+ PageActionWithBadgeView(PageActionImageView* image_view);
PageActionImageView* image_view() { return image_view_; }
@@ -698,15 +698,6 @@
if (profile_->GetExtensionsService())
page_actions = profile_->GetExtensionsService()->GetPageActions();
- // Page actions can be created without an icon, so make sure we count only
- // those that have been given an icon.
- for (size_t i = 0; i < page_actions.size();) {
- if (page_actions[i]->icon_paths().empty())
- page_actions.erase(page_actions.begin() + i);
- else
- ++i;
- }
-
// On startup we sometimes haven't loaded any extensions. This makes sure
// we catch up when the extensions (and any page actions) load.
if (page_actions.size() != page_action_views_.size()) {
« no previous file with comments | « chrome/browser/gtk/location_bar_view_gtk.cc ('k') | chrome/test/data/extensions/browsertest/crash_25562/background.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698