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

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/views/toolbar/browser_actions_container.h" 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 iter != toolbar_action_views_.end(); ++iter) { 176 iter != toolbar_action_views_.end(); ++iter) {
177 if ((*iter)->view_controller() == action) { 177 if ((*iter)->view_controller() == action) {
178 delete *iter; 178 delete *iter;
179 toolbar_action_views_.erase(iter); 179 toolbar_action_views_.erase(iter);
180 break; 180 break;
181 } 181 }
182 } 182 }
183 } 183 }
184 184
185 void BrowserActionsContainer::RemoveAllViews() { 185 void BrowserActionsContainer::RemoveAllViews() {
186 STLDeleteElements(&toolbar_action_views_); 186 base::STLDeleteElements(&toolbar_action_views_);
187 } 187 }
188 188
189 void BrowserActionsContainer::Redraw(bool order_changed) { 189 void BrowserActionsContainer::Redraw(bool order_changed) {
190 if (!added_to_view_) { 190 if (!added_to_view_) {
191 // We don't want to redraw before the view has been fully added to the 191 // We don't want to redraw before the view has been fully added to the
192 // hierarchy. 192 // hierarchy.
193 return; 193 return;
194 } 194 }
195 195
196 // Don't allow resizing if the bar is highlighting. 196 // Don't allow resizing if the bar is highlighting.
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 } 664 }
665 } 665 }
666 666
667 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { 667 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) {
668 DCHECK(active_bubble_); 668 DCHECK(active_bubble_);
669 DCHECK_EQ(active_bubble_->GetWidget(), widget); 669 DCHECK_EQ(active_bubble_->GetWidget(), widget);
670 widget->RemoveObserver(this); 670 widget->RemoveObserver(this);
671 active_bubble_ = nullptr; 671 active_bubble_ = nullptr;
672 toolbar_actions_bar_->OnBubbleClosed(); 672 toolbar_actions_bar_->OnBubbleClosed();
673 } 673 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698