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

12 files changed, 56 insertions, 60 deletions

diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc
index 5fccf5f..11f5189 100644
--- a/chrome/browser/ui/views/about_ipc_dialog.cc
+++ b/chrome/browser/ui/views/about_ipc_dialog.cc
@@ -97,7 +97,7 @@ void InitDialog(HWND hwnd) {
   messages->InsertColumn(0, L"id", LVCFMT_LEFT, 230);
 
   LogFunctionMap* log_functions = IPC::Logging::log_function_map();
-  for (LogFunctionMap::iterator i = log_functions->begin();
+  for (LogFunctionMap::iterator i(log_functions->begin());
        i != log_functions->end(); ++i) {
     std::string name;
     (*i->second)(&name, NULL, NULL);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index f1b85c4..752ef35 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -495,8 +495,8 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::AddNewFolder(
 void BookmarkEditorView::ExpandAndSelect() {
   BookmarkExpandedStateTracker::Nodes expanded_nodes =
       bb_model_->expanded_state_tracker()->GetExpandedNodes();
-  for (BookmarkExpandedStateTracker::Nodes::const_iterator i =
-       expanded_nodes.begin(); i != expanded_nodes.end(); ++i) {
+  for (BookmarkExpandedStateTracker::Nodes::const_iterator i(
+       expanded_nodes.begin()); i != expanded_nodes.end(); ++i) {
     EditorNode* editor_node =
         FindNodeWithID(tree_model_->GetRoot(), (*i)->id());
     if (editor_node)
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
index 95edc9e..6762523 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -319,7 +319,7 @@ void BookmarkMenuDelegate::BookmarkNodeFaviconChanged(
     return;  // We're not showing a menu item for the node.
 
   // Iterate through the menus looking for the menu containing node.
-  for (NodeToMenuMap::iterator i = node_to_menu_map_.begin();
+  for (NodeToMenuMap::iterator i(node_to_menu_map_.begin());
        i != node_to_menu_map_.end(); ++i) {
     MenuItemView* menu_item = i->second->GetMenuItemByID(menu_pair->second);
     if (menu_item) {
@@ -352,7 +352,7 @@ void BookmarkMenuDelegate::WillRemoveBookmarks(
 
   // Remove the menu items.
   std::set<MenuItemView*> changed_parent_menus;
-  for (std::vector<const BookmarkNode*>::const_iterator i = bookmarks.begin();
+  for (std::vector<const BookmarkNode*>::const_iterator i(bookmarks.begin());
        i != bookmarks.end(); ++i) {
     NodeToMenuIDMap::iterator node_to_menu = node_to_menu_id_map_.find(*i);
     if (node_to_menu != node_to_menu_id_map_.end()) {
@@ -373,27 +373,25 @@ void BookmarkMenuDelegate::WillRemoveBookmarks(
   // is the DCHECK.
   DCHECK(changed_parent_menus.size() <= 1);
 
-  for (std::set<MenuItemView*>::const_iterator i = changed_parent_menus.begin();
-       i != changed_parent_menus.end(); ++i) {
+  for (std::set<MenuItemView*>::const_iterator i(changed_parent_menus.begin());
+       i != changed_parent_menus.end(); ++i)
     (*i)->ChildrenChanged();
-  }
 
-  // Remove any descendants of the removed nodes in node_to_menu_id_map_.
-  for (NodeToMenuIDMap::iterator i = node_to_menu_id_map_.begin();
+  // Remove any descendants of the removed nodes in |node_to_menu_id_map_|.
+  for (NodeToMenuIDMap::iterator i(node_to_menu_id_map_.begin());
        i != node_to_menu_id_map_.end(); ) {
     bool ancestor_removed = false;
-    for (std::vector<const BookmarkNode*>::const_iterator j = bookmarks.begin();
+    for (std::vector<const BookmarkNode*>::const_iterator j(bookmarks.begin());
          j != bookmarks.end(); ++j) {
       if (i->first->HasAncestor(*j)) {
         ancestor_removed = true;
         break;
       }
     }
-    if (ancestor_removed) {
+    if (ancestor_removed)
       node_to_menu_id_map_.erase(i++);
-    } else {
+    else
       ++i;
-    }
   }
 }
 
@@ -483,7 +481,7 @@ void BookmarkMenuDelegate::BuildMenu(const BookmarkNode* parent,
 }
 
 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {
-  for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin();
+  for (NodeToMenuMap::const_iterator i(node_to_menu_map_.begin());
        i != node_to_menu_map_.end(); ++i) {
     MenuItemView* menu = i->second->GetMenuItemByID(id);
     if (menu)
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.
diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
index 1f7fc17..ac4ca70 100644
--- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
+++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
@@ -268,15 +268,15 @@ void ChromeToMobileBubbleView::Init() {
 
     views::RadioButton* radio = NULL;
     layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
-    for (std::vector<DictionaryValue*>::const_iterator it = mobiles.begin();
-         it != mobiles.end(); ++it) {
+    for (std::vector<DictionaryValue*>::const_iterator i(mobiles.begin());
+         i != mobiles.end(); ++i) {
       string16 name;
-      (*it)->GetString("name", &name);
+      (*i)->GetString("name", &name);
       radio = new views::RadioButton(name, 0);
       radio->set_listener(this);
       radio->SetEnabledColor(SK_ColorBLACK);
       radio->SetHoverColor(SK_ColorBLACK);
-      mobile_map_[radio] = *it;
+      mobile_map_[radio] = *i;
       layout->StartRow(0, single_column_set_id);
       layout->AddView(radio);
     }
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index e8652ef..a26d121 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -158,12 +158,11 @@ void ContentSettingBubbleContents::Init() {
   if (!plugins.empty()) {
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-    for (std::set<std::string>::const_iterator it = plugins.begin();
-        it != plugins.end(); ++it) {
-      string16 name =
-          PluginService::GetInstance()->GetPluginGroupName(*it);
+    for (std::set<std::string>::const_iterator i(plugins.begin());
+         i != plugins.end(); ++i) {
+      string16 name = PluginService::GetInstance()->GetPluginGroupName(*i);
       if (name.empty())
-        name = UTF8ToUTF16(*it);
+        name = UTF8ToUTF16(*i);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(new views::Label(name));
       bubble_content_empty = false;
@@ -204,8 +203,8 @@ void ContentSettingBubbleContents::Init() {
   if (!radio_group.radio_items.empty()) {
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-    for (ContentSettingBubbleModel::RadioItems::const_iterator i =
-         radio_group.radio_items.begin();
+    for (ContentSettingBubbleModel::RadioItems::const_iterator i(
+         radio_group.radio_items.begin());
          i != radio_group.radio_items.end(); ++i) {
       views::RadioButton* radio = new views::RadioButton(UTF8ToUTF16(*i), 0);
       radio->SetEnabled(bubble_content.radio_group_enabled);
@@ -231,8 +230,8 @@ void ContentSettingBubbleContents::Init() {
       0, views::kPanelHorizIndentation);
   indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                                         1, GridLayout::USE_PREF, 0, 0);
-  for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i =
-       bubble_content.domain_lists.begin();
+  for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i(
+       bubble_content.domain_lists.begin());
        i != bubble_content.domain_lists.end(); ++i) {
     layout->StartRow(0, single_column_set_id);
     views::Label* section_title = new views::Label(UTF8ToUTF16(i->title));
@@ -293,7 +292,7 @@ void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
     return;
   }
 
-  for (RadioGroup::const_iterator i = radio_group_.begin();
+  for (RadioGroup::const_iterator i(radio_group_.begin());
        i != radio_group_.end(); ++i) {
     if (sender == *i) {
       content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 9e88666..ed37dad 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -56,9 +56,9 @@ PageActionImageView::PageActionImageView(LocationBarView* owner,
   if (!page_action_->default_icon_path().empty())
     icon_paths.push_back(page_action_->default_icon_path());
 
-  for (std::vector<std::string>::iterator iter = icon_paths.begin();
-       iter != icon_paths.end(); ++iter) {
-    tracker_.LoadImage(extension, extension->GetResource(*iter),
+  for (std::vector<std::string>::iterator i(icon_paths.begin());
+       i != icon_paths.end(); ++i) {
+    tracker_.LoadImage(extension, extension->GetResource(*i),
                        gfx::Size(Extension::kPageActionIconMaxSize,
                                  Extension::kPageActionIconMaxSize),
                        ImageLoadingTracker::DONT_CACHE);
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index 5e2f4b6..44054e3 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -275,16 +275,16 @@ void SelectFileDialogExtension::SelectFileImpl(
     // window.
     std::vector<Profile*> profiles =
         g_browser_process->profile_manager()->GetLoadedProfiles();
-    for (std::vector<Profile*>::const_iterator iter = profiles.begin();
-         iter < profiles.end(); iter++) {
-      ShellWindowRegistry* registry = ShellWindowRegistry::Get(*iter);
+    for (std::vector<Profile*>::const_iterator i(profiles.begin());
+         i < profiles.end(); ++i) {
+      ShellWindowRegistry* registry = ShellWindowRegistry::Get(*i);
       DCHECK(registry);
       ShellWindow* shell_window = registry->GetShellWindowForNativeWindow(
           owner_window);
       if (shell_window) {
         base_window = shell_window;
         tab = shell_window->tab_contents();
-        profile_ = *iter;
+        profile_ = *i;
         break;
       }
     }
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index e8901c6..3b545d5 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -556,7 +556,7 @@ void BrowserTabStripController::StartHighlightTabsForCommand(
     if (IsValidIndex(model_index)) {
       std::vector<int> indices =
           model_->GetIndicesClosedByCommand(model_index, command_id);
-      for (std::vector<int>::const_iterator i = indices.begin();
+      for (std::vector<int>::const_iterator i(indices.begin());
            i != indices.end(); ++i) {
         tabstrip_->StartHighlight(*i);
       }
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index c3cd7bf..577d31a 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -1196,7 +1196,7 @@ void TabDragController::Detach(ReleaseCapture release_capture) {
       // still there.
       TabStripSelectionModel selection_model;
       selection_model.Copy(initial_selection_model_);
-      for (DragData::const_reverse_iterator i = drag_data_.rbegin();
+      for (DragData::const_reverse_iterator i(drag_data_.rbegin());
            i != drag_data_.rend(); ++i) {
         selection_model.DecrementFrom(i->source_model_index);
       }
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index a049a23..3d13bd0 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -905,7 +905,7 @@ void TabStrip::CloseTab(BaseTab* tab) {
     // If the tab is already closing, close the next tab. We do this so that the
     // user can rapidly close tabs by clicking the close button and not have
     // the animations interfere with that.
-    for (TabsClosingMap::const_iterator i = tabs_closing_map_.begin();
+    for (TabsClosingMap::const_iterator i(tabs_closing_map_.begin());
          i != tabs_closing_map_.end(); ++i) {
       std::vector<BaseTab*>::const_iterator j =
           std::find(i->second.begin(), i->second.end(), tab);
@@ -1648,7 +1648,7 @@ void TabStrip::RemoveTabFromViewModel(int index) {
 
 void TabStrip::RemoveAndDeleteTab(BaseTab* tab) {
   scoped_ptr<BaseTab> deleter(tab);
-  for (TabsClosingMap::iterator i = tabs_closing_map_.begin();
+  for (TabsClosingMap::iterator i(tabs_closing_map_.begin());
        i != tabs_closing_map_.end(); ++i) {
     std::vector<BaseTab*>::iterator j =
         std::find(i->second.begin(), i->second.end(), tab);
@@ -1674,13 +1674,12 @@ void TabStrip::UpdateTabsClosingMap(int index, int delta) {
         tabs_closing_map_[index - 1].end(), tabs.begin(), tabs.end());
   }
   TabsClosingMap updated_map;
-  for (TabsClosingMap::iterator i = tabs_closing_map_.begin();
+  for (TabsClosingMap::iterator i(tabs_closing_map_.begin());
        i != tabs_closing_map_.end(); ++i) {
-    if (i->first > index) {
+    if (i->first > index)
       updated_map[i->first + delta] = i->second;
-    } else if (i->first < index) {
+    else if (i->first < index)
       updated_map[i->first] = i->second;
-    }
   }
   if (delta > 0 && tabs_closing_map_.find(index) != tabs_closing_map_.end())
     updated_map[index + delta] = tabs_closing_map_[index];
@@ -1766,7 +1765,7 @@ void TabStrip::PaintClosingTabs(gfx::Canvas* canvas, int index) {
     return;
 
   const std::vector<BaseTab*>& tabs = tabs_closing_map_[index];
-  for (std::vector<BaseTab*>::const_reverse_iterator i = tabs.rbegin();
+  for (std::vector<BaseTab*>::const_reverse_iterator i(tabs.rbegin());
        i != tabs.rend(); ++i) {
     (*i)->Paint(canvas);
   }
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 96ffdbc..d3bfbd1 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -717,8 +717,8 @@ void TaskManagerView::ShowContextMenuForView(views::View* source,
   UpdateStatsCounters();
   scoped_ptr<views::Menu> menu(views::Menu::Create(
       this, views::Menu::TOPLEFT, source->GetWidget()->GetNativeView()));
-  for (std::vector<ui::TableColumn>::iterator i =
-       columns_.begin(); i != columns_.end(); ++i) {
+  for (std::vector<ui::TableColumn>::iterator i(columns_.begin());
+       i != columns_.end(); ++i) {
     menu->AppendMenuItem(i->id, l10n_util::GetStringUTF16(i->id),
         views::Menu::CHECKBOX);
   }