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

Side by Side Diff: chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc

Issue 2424853003: Remove FOR_EACH_OBSERVER macro usage in chrome/browser/ui (Closed)
Patch Set: explicit types Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h" 5 #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/bookmarks/browser/bookmark_model.h" 10 #include "components/bookmarks/browser/bookmark_model.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 for (std::vector<Item>::iterator i = items_.begin(); 169 for (std::vector<Item>::iterator i = items_.begin();
170 i != items_.end();) { 170 i != items_.end();) {
171 if (i->type == Item::TYPE_NODE && i->node->HasAncestor(node)) { 171 if (i->type == Item::TYPE_NODE && i->node->HasAncestor(node)) {
172 i = items_.erase(i); 172 i = items_.erase(i);
173 changed = true; 173 changed = true;
174 } else { 174 } else {
175 ++i; 175 ++i;
176 } 176 }
177 } 177 }
178 if (changed) { 178 if (changed) {
179 FOR_EACH_OBSERVER(ui::ComboboxModelObserver, observers_, 179 for (ui::ComboboxModelObserver& observer : observers_)
180 OnComboboxModelChanged(this)); 180 observer.OnComboboxModelChanged(this);
181 } 181 }
182 } 182 }
183 183
184 void RecentlyUsedFoldersComboModel::BookmarkNodeRemoved( 184 void RecentlyUsedFoldersComboModel::BookmarkNodeRemoved(
185 BookmarkModel* model, 185 BookmarkModel* model,
186 const BookmarkNode* parent, 186 const BookmarkNode* parent,
187 int old_index, 187 int old_index,
188 const BookmarkNode* node, 188 const BookmarkNode* node,
189 const std::set<GURL>& removed_urls) {} 189 const std::set<GURL>& removed_urls) {}
190 190
(...skipping 22 matching lines...) Expand all
213 i != items_.end();) { 213 i != items_.end();) {
214 if (i->type == Item::TYPE_NODE && 214 if (i->type == Item::TYPE_NODE &&
215 !bookmark_model_->is_permanent_node(i->node)) { 215 !bookmark_model_->is_permanent_node(i->node)) {
216 i = items_.erase(i); 216 i = items_.erase(i);
217 changed = true; 217 changed = true;
218 } else { 218 } else {
219 ++i; 219 ++i;
220 } 220 }
221 } 221 }
222 if (changed) { 222 if (changed) {
223 FOR_EACH_OBSERVER(ui::ComboboxModelObserver, observers_, 223 for (ui::ComboboxModelObserver& observer : observers_)
224 OnComboboxModelChanged(this)); 224 observer.OnComboboxModelChanged(this);
225 } 225 }
226 } 226 }
227 227
228 void RecentlyUsedFoldersComboModel::MaybeChangeParent( 228 void RecentlyUsedFoldersComboModel::MaybeChangeParent(
229 const BookmarkNode* node, 229 const BookmarkNode* node,
230 int selected_index) { 230 int selected_index) {
231 if (items_[selected_index].type != Item::TYPE_NODE) 231 if (items_[selected_index].type != Item::TYPE_NODE)
232 return; 232 return;
233 233
234 const BookmarkNode* new_parent = GetNodeAt(selected_index); 234 const BookmarkNode* new_parent = GetNodeAt(selected_index);
(...skipping 10 matching lines...) Expand all
245 return items_[index].node; 245 return items_[index].node;
246 } 246 }
247 247
248 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { 248 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) {
249 std::vector<Item>::iterator it = std::find(items_.begin(), 249 std::vector<Item>::iterator it = std::find(items_.begin(),
250 items_.end(), 250 items_.end(),
251 Item(node, Item::TYPE_NODE)); 251 Item(node, Item::TYPE_NODE));
252 if (it != items_.end()) 252 if (it != items_.end())
253 items_.erase(it); 253 items_.erase(it);
254 } 254 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698