summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/browser_actions_container.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 23:47:45 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 23:47:45 +0000
commit95dc91e957020ab6cdc733b2ede68ee72c4b3177 (patch)
tree3faedec2c1bc820fd2c142f46bef4b0a22864fbb /chrome/browser/ui/views/browser_actions_container.cc
parent2b22afbc28d49b22f8d95845df504baad750a366 (diff)
downloadchromium_src-95dc91e957020ab6cdc733b2ede68ee72c4b3177.zip
chromium_src-95dc91e957020ab6cdc733b2ede68ee72c4b3177.tar.gz
chromium_src-95dc91e957020ab6cdc733b2ede68ee72c4b3177.tar.bz2
views: Be consistent in our for loop usage.
This fixes all the occurrences I could find with: $ g grep -n "for (" chrome/browser/ui/views/ | grep "iter =" | grep iterator | grep -v chrome/browser/ui/views/ash/ $ g grep -n "for (" chrome/browser/ui/views/ | grep "it =" | grep iterator | grep -v chrome/browser/ui/views/ash/ $ g grep -n "for (" chrome/browser/ui/views/ | grep "i =" | grep iterator | grep -v chrome/browser/ui/views/ash/ This will help us to push others to follow the same style everywhere under this directory in codereviews. So we can tell them to do a quick grep and follow the convention. R=pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10695002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/browser_actions_container.cc')
-rw-r--r--chrome/browser/ui/views/browser_actions_container.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 082e513..ce923b2 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -134,10 +134,10 @@ int BrowserActionsContainer::GetCurrentTabId() const {
BrowserActionView* BrowserActionsContainer::GetBrowserActionView(
ExtensionAction* action) {
- for (BrowserActionViews::iterator iter = browser_action_views_.begin();
- iter != browser_action_views_.end(); ++iter) {
- if ((*iter)->button()->browser_action() == action)
- return *iter;
+ for (BrowserActionViews::iterator i(browser_action_views_.begin());
+ i != browser_action_views_.end(); ++i) {
+ if ((*i)->button()->browser_action() == action)
+ return *i;
}
return NULL;
}
@@ -152,12 +152,12 @@ void BrowserActionsContainer::CreateBrowserActionViews() {
if (!model_)
return;
- for (extensions::ExtensionList::iterator iter = model_->begin();
- iter != model_->end(); ++iter) {
- if (!ShouldDisplayBrowserAction(*iter))
+ for (extensions::ExtensionList::iterator i(model_->begin());
+ i != model_->end(); ++i) {
+ if (!ShouldDisplayBrowserAction(*i))
continue;
- BrowserActionView* view = new BrowserActionView(*iter, this);
+ BrowserActionView* view = new BrowserActionView(*i, this);
browser_action_views_.push_back(view);
AddChildView(view);
}
@@ -620,11 +620,11 @@ void BrowserActionsContainer::BrowserActionRemoved(const Extension* extension) {
HidePopup();
size_t visible_actions = VisibleBrowserActions();
- for (BrowserActionViews::iterator iter = browser_action_views_.begin();
- iter != browser_action_views_.end(); ++iter) {
- if ((*iter)->button()->extension() == extension) {
- delete *iter;
- browser_action_views_.erase(iter);
+ for (BrowserActionViews::iterator i(browser_action_views_.begin());
+ i != browser_action_views_.end(); ++i) {
+ if ((*i)->button()->extension() == extension) {
+ delete *i;
+ browser_action_views_.erase(i);
// If the extension is being upgraded we don't want the bar to shrink
// because the icon is just going to get re-added to the same location.