Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/views/location_bar/location_bar_view.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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 584 matching lines @@
           GetTemplateURLForKeyword(keyword);
       if (template_url && template_url->IsExtensionKeyword()) {
         const SkBitmap& bitmap =
             profile_->GetExtensionService()->GetOmniboxIcon(
                 template_url->GetExtensionId());
         selected_keyword_view_->SetImage(bitmap);
         selected_keyword_view_->set_is_extension_icon(true);
       } else {
         ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
         selected_keyword_view_->SetImage(
-            *rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH));
+            *rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
   } else if (show_keyword_hint) {
     if (keyword_hint_view_->keyword() != keyword)
       keyword_hint_view_->SetKeyword(keyword);
   }
 
   // Lay out items to the right of the edit field.
   int offset = width() - kEdgeThickness - kEdgeItemPadding;
@@ skipping 250 matching lines @@
         } else {
           // The navigation controller will delete the fetcher.
         }
       }
     }
   }
 }
 
 void LocationBarView::OnChanged() {
   location_icon_view_->SetImage(
-      ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           location_entry_->GetIcon()));
   location_icon_view_->ShowTooltip(!GetLocationEntry()->IsEditingOrEmpty());
 
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::OnSelectionBoundsChanged() {
 #if defined(OS_WIN)
   if (suggested_text_view_)
@@ skipping 379 matching lines @@
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif