Merge 54174 - Browser actions container layout changes for M6 theme....

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
@@ skipping 164 matching lines @@
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
   AddChildView(app_menu_);
 
   location_bar_->Init();
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
+  browser_actions_->Init();
 
   SetProfile(profile);
 }
 
 void ToolbarView::SetProfile(Profile* profile) {
   if (profile != profile_) {
     profile_ = profile;
     location_bar_->SetProfile(profile);
   }
 }
@@ skipping 459 matching lines @@
         *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),
         value);
   }
 
   static const int kBadgeLeftSpacing = 8;
   static const int kBadgeTopSpacing = 18;
   canvas->DrawBitmapInt(badge, kBadgeLeftSpacing, kBadgeTopSpacing);
 
   return canvas->ExtractBitmap();
 }