Use the correct launcher assets for shelf alignment.

Cleanup: remove redundant shelf code.
- replaces switch to get values for alignment with template
- eliminate alignment member variables and use shelf_layout_manager where possible.

other minor clean ups: remove unnecessary namespace, use member variable.

BUG=151417
TEST=none

Review URL: https://chromiumcodereview.appspot.com/11434099

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171120 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 6 deletions

diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index 7bd5682..517607c 100644
--- a/ash/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -115,17 +115,20 @@ const gfx::ImageSkia*
 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);
 }