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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10533086: Action box menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Action box menu Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 00e8a410cfd9a23d064be54c8dc03cb07cfa223a..606114142c3a1a6376862ef2644c5c64eb6349e3 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -241,8 +241,7 @@ void LocationBarView::Init(views::View* popup_parent_view) {
}
if (extensions::switch_utils::IsActionBoxEnabled()) {
- action_box_button_view_ = new ActionBoxButtonView(
- ExtensionSystem::Get(profile_)->extension_service());
+ action_box_button_view_ = new ActionBoxButtonView(profile_, delegate_);
AddChildView(action_box_button_view_);
} else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
// Note: condition above means that the star and ChromeToMobile icons are
@@ -448,6 +447,8 @@ views::View* LocationBarView::GetPageActionView(ExtensionAction *page_action) {
void LocationBarView::SetStarToggled(bool on) {
if (star_view_)
star_view_->SetToggled(on);
+ if (action_box_button_view_)
+ action_box_button_view_->SetBookmarkState(on);
}
void LocationBarView::ShowStarBubble(const GURL& url, bool newly_bookmarked) {

Powered by Google App Engine
This is Rietveld 408576698