Use the correct launcher assets for shelf alignment.

ash/launcher/launcher.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/launcher.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
@@ skipping 149 matching lines @@
     launcher_view->SetBounds(0, 0, w, height());
   } else {
     int h = std::max(0, height() - launcher_->status_size_.height());
     launcher_view->SetBounds(0, 0, width(), h);
   }
 }
 
 void Launcher::DelegateView::OnPaintBackground(gfx::Canvas* canvas) {
   if (launcher_->alignment_ == SHELF_ALIGNMENT_BOTTOM) {
     SkPaint paint;
-    static const gfx::ImageSkia* launcher_background = NULL;
-    if (!launcher_background) {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      launcher_background =
-          rb.GetImageNamed(IDR_AURA_LAUNCHER_BACKGROUND_BOTTOM).ToImageSkia();
-    }
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    const gfx::ImageSkia* launcher_background = rb.GetImageSkiaNamed(
+        internal::ShelfLayoutManager::ForLauncher(
+            launcher_->widget()->GetNativeView())->
+        SelectValueForShelfAlignment(IDR_AURA_LAUNCHER_BACKGROUND_BOTTOM,
+                                     IDR_AURA_LAUNCHER_BACKGROUND_LEFT,
+                                     IDR_AURA_LAUNCHER_BACKGROUND_RIGHT));
     paint.setAlpha(alpha_);
     canvas->DrawImageInt(
         *launcher_background,
         0, 0, launcher_background->width(), launcher_background->height(),
         0, 0, width(), height(),
         false,
         paint);
     canvas->FillRect(
         gfx::Rect(0, height() - kNumBlackPixels, width(), kNumBlackPixels),
         SK_ColorBLACK);
@@ skipping 37 matching lines @@
   delegate_view_->AddChildView(launcher_view_);
   params.delegate = delegate_view_;
   widget_->Init(params);
   widget_->GetNativeWindow()->SetName("LauncherWindow");
   // The launcher should not take focus when it is initially shown.
   widget_->set_focus_on_creation(false);
   widget_->SetContentsView(delegate_view_);
   widget_->GetNativeView()->SetName("LauncherView");
   widget_->GetNativeView()->SetProperty(internal::kStayInSameRootWindowKey,
                                         true);
+
   // SetBounds() has to be called after kStayInSameRootWindowKey is set.
   gfx::Size pref =
       static_cast<views::View*>(launcher_view_)->GetPreferredSize();
   widget_->SetBounds(gfx::Rect(pref));
 }
 
 Launcher::~Launcher() {
 }
 
 // static
@@ skipping 130 matching lines @@
   widget_->SetBounds(bounds);
   if (dimmer_.get())
     dimmer_->SetBounds(bounds);
 }
 
 internal::LauncherView* Launcher::GetLauncherViewForTest() {
   return launcher_view_;
 }
 
 }  // namespace ash