OLD | NEW |
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/views/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/browser_actions_container.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 } | 145 } |
146 | 146 |
147 void BrowserActionsContainer::CreateBrowserActionViews() { | 147 void BrowserActionsContainer::CreateBrowserActionViews() { |
148 DCHECK(browser_action_views_.empty()); | 148 DCHECK(browser_action_views_.empty()); |
149 if (!model_) | 149 if (!model_) |
150 return; | 150 return; |
151 | 151 |
152 const extensions::ExtensionList& toolbar_items = model_->toolbar_items(); | 152 const extensions::ExtensionList& toolbar_items = model_->toolbar_items(); |
153 for (extensions::ExtensionList::const_iterator i(toolbar_items.begin()); | 153 for (extensions::ExtensionList::const_iterator i(toolbar_items.begin()); |
154 i != toolbar_items.end(); ++i) { | 154 i != toolbar_items.end(); ++i) { |
155 if (!ShouldDisplayBrowserAction(*i)) | 155 if (!ShouldDisplayBrowserAction(i->get())) |
156 continue; | 156 continue; |
157 | 157 |
158 BrowserActionView* view = new BrowserActionView(*i, browser_, this); | 158 BrowserActionView* view = new BrowserActionView(i->get(), browser_, this); |
159 browser_action_views_.push_back(view); | 159 browser_action_views_.push_back(view); |
160 AddChildView(view); | 160 AddChildView(view); |
161 } | 161 } |
162 } | 162 } |
163 | 163 |
164 void BrowserActionsContainer::DeleteBrowserActionViews() { | 164 void BrowserActionsContainer::DeleteBrowserActionViews() { |
165 HidePopup(); | 165 HidePopup(); |
166 STLDeleteElements(&browser_action_views_); | 166 STLDeleteElements(&browser_action_views_); |
167 } | 167 } |
168 | 168 |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
840 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT; | 840 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT; |
841 popup_ = ExtensionPopup::ShowPopup(popup_url, | 841 popup_ = ExtensionPopup::ShowPopup(popup_url, |
842 browser_, | 842 browser_, |
843 reference_view, | 843 reference_view, |
844 arrow, | 844 arrow, |
845 show_action); | 845 show_action); |
846 popup_->GetWidget()->AddObserver(this); | 846 popup_->GetWidget()->AddObserver(this); |
847 popup_button_ = button; | 847 popup_button_ = button; |
848 popup_button_->SetButtonPushed(); | 848 popup_button_->SetButtonPushed(); |
849 } | 849 } |
OLD | NEW |