Use the correct launcher assets for shelf alignment.

ash/launcher/tabbed_launcher_button.cc

 // Copyright (c) 2012 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 "ash/launcher/tabbed_launcher_button.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/launcher/launcher_types.h"
@@ skipping 97 matching lines @@
 const gfx::ImageSkia* TabbedLauncherButton::IconView::incognito_browser_image_ =
     NULL;
 const gfx::ImageSkia* TabbedLauncherButton::IconView::browser_panel_image_ =
     NULL;
 const gfx::ImageSkia*
     TabbedLauncherButton::IconView::incognito_browser_panel_image_ = NULL;
 
 TabbedLauncherButton* TabbedLauncherButton::Create(
     views::ButtonListener* listener,
     LauncherButtonHost* host,
+    ShelfLayoutManager* shelf_layout_manager,
     IncognitoState is_incognito) {
-  TabbedLauncherButton* button =
-      new TabbedLauncherButton(listener, host, is_incognito);
+  TabbedLauncherButton* button = new TabbedLauncherButton(
+      listener, host, shelf_layout_manager, is_incognito);
   button->Init();
   return button;
 }
 
-TabbedLauncherButton::TabbedLauncherButton(views::ButtonListener* listener,
-                                           LauncherButtonHost* host,
-                                           IncognitoState is_incognito)
-    : LauncherButton(listener, host),
+TabbedLauncherButton::TabbedLauncherButton(
+    views::ButtonListener* listener,
+    LauncherButtonHost* host,
+    ShelfLayoutManager* shelf_layout_manager,
+    IncognitoState is_incognito)
+    : LauncherButton(listener, host, shelf_layout_manager),
       is_incognito_(is_incognito) {
   set_accessibility_focusable(true);
 }
 
 TabbedLauncherButton::~TabbedLauncherButton() {
 }
 
 void TabbedLauncherButton::SetTabImage(const gfx::ImageSkia& image) {
   tabbed_icon_view()->SetTabImage(image);
 }
 
 void TabbedLauncherButton::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = host()->GetAccessibleName(this);
 }
 
 LauncherButton::IconView* TabbedLauncherButton::CreateIconView() {
   return new IconView(this);
 }
 
 }  // namespace internal
 }  // namespace ash