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

2 files changed, 12 insertions, 14 deletions

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)