views: Stop using ResourceBundle without the namespace prefix.

R=pkasting@chromium.org

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

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

52 files changed, 161 insertions, 168 deletions

diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index a628ccc..b21cbd0 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -141,7 +141,7 @@ AboutChromeView::~AboutChromeView() {
 
 void AboutChromeView::Init() {
   text_direction_is_rtl_ = base::i18n::IsRTL();
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
@@ -178,8 +178,8 @@ void AboutChromeView::Init() {
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-  about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont).DeriveFont(18));
+  about_title_label_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetBackgroundColor(SK_ColorWHITE);
   about_title_label_->SetEnabledColor(SK_ColorBLACK);
   AddChildView(about_title_label_);
@@ -197,8 +197,8 @@ void AboutChromeView::Init() {
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
-  version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont));
+  version_label_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont));
   AddChildView(version_label_);
 
   // The copyright URL portion of the main label.
@@ -265,8 +265,8 @@ void AboutChromeView::Init() {
   // Create a label and add the full text so we can query it for the height.
   views::Label dummy_text(full_text);
   dummy_text.SetMultiLine(true);
-  gfx::Font font =
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont);
 
   // Add up the height of the various elements on the page.
   int height = about_background_logo->height() +
@@ -426,13 +426,13 @@ void AboutChromeView::OnPaint(gfx::Canvas* canvas) {
   // Draw the background image color (and the separator) across the dialog.
   // This will become the background for the logo image at the top of the
   // dialog.
-  SkBitmap* background = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  SkBitmap* background = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_ABOUT_BACKGROUND_COLOR);
   canvas->TileImageInt(*background, 0, 0, dialog_dimensions_.width(),
                        background->height());
 
-  gfx::Font font =
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont);
 
   const gfx::Rect label_bounds = main_text_label_->bounds();
 
diff --git a/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc b/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc
index b385530..f005d6f 100644
--- a/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc
+++ b/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/ash/app_list/extension_app_item.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -33,7 +33,7 @@ class ChromeAppItem : public ChromeAppListItem {
  public:
   ChromeAppItem() : ChromeAppListItem(TYPE_OTHER) {
     SetTitle(l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME));
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     SetIcon(*rb.GetImageNamed(IDR_PRODUCT_LOGO_128).ToSkBitmap());
   }
 
diff --git a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
index f81b98c..5958e0e 100644
--- a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ -183,7 +183,7 @@ void ExtensionAppItem::LoadImage(const Extension* extension) {
           FilePath().AppendASCII(kComponentExtensionResources[i].name);
       bm_resource_path = bm_resource_path.NormalizePathSeparators();
       if (relative_path == bm_resource_path) {
-        ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+        ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
         int resource = kComponentExtensionResources[i].value;
 
         base::StringPiece contents = rb.GetRawDataResource(resource);
@@ -214,7 +214,7 @@ void ExtensionAppItem::LoadDefaultImage() {
   if (extension && extension->id() == extension_misc::kWebStoreAppId)
       resource = IDR_WEBSTORE_ICON;
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetIcon(*rb.GetImageNamed(resource).ToSkBitmap());
 }
 
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_updater.cc b/chrome/browser/ui/views/ash/launcher/launcher_updater.cc
index 8c2d5a1..475c127 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_updater.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_updater.cc
@@ -187,15 +187,14 @@ void LauncherUpdater::UpdateLauncher(TabContentsWrapper* tab) {
     else if (item.image.empty())
       item.image = Extension::GetDefaultIcon(true);
   } else {
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
       item.image = tab->favicon_tab_helper()->GetFavicon();
       if (item.image.empty()) {
-        item.image = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
-            IDR_DEFAULT_FAVICON);
+        item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
       }
     } else {
-      item.image = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
-          IDR_DEFAULT_FAVICON);
+      item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     }
   }
   launcher_model()->Set(item_index, item);
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
index 16f6e03..6555c08 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
@@ -114,7 +114,7 @@ AutocompleteResultView::AutocompleteResultView(
           animation_(new ui::SlideAnimation(this))) {
   CHECK_GE(model_index, 0);
   if (default_icon_size_ == 0) {
-    default_icon_size_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    default_icon_size_ = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
         AutocompleteMatch::TypeToIcon(AutocompleteMatch::URL_WHAT_YOU_TYPED))->
         width();
   }
@@ -295,13 +295,13 @@ const SkBitmap* AutocompleteResultView::GetIcon() const {
         break;
     }
   }
-  return ResourceBundle::GetSharedInstance().GetBitmapNamed(icon);
+  return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(icon);
 }
 
 const SkBitmap* AutocompleteResultView::GetKeywordIcon() const {
   // NOTE: If we ever begin returning icons of varying size, then callers need
   // to ensure that |keyword_icon_| is resized each time its image is reset.
-  return ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       (GetState() == SELECTED) ? IDR_OMNIBOX_TTS_SELECTED : IDR_OMNIBOX_TTS);
 }
 
diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc
index b288984..788858c 100644
--- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc
+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc
@@ -190,8 +190,8 @@ ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item,
   AddChildView(image_view_);
 
   // Add a label to show the profile name.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  const gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  const gfx::Font base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   const int style = item_.active ? gfx::Font::BOLD : 0;
   const int kNameFontDelta = 1;
   name_label_ = new views::Label(item_.name,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 69a8ec5..031df38 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -361,8 +361,8 @@ bool BookmarkBarView::testing_ = false;
 // Returns the bitmap to use for starred folders.
 static const SkBitmap& GetFolderIcon() {
   if (!kFolderIcon) {
-    kFolderIcon = ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    kFolderIcon = rb.GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
   }
   return *kFolderIcon;
 }
@@ -1117,7 +1117,7 @@ void BookmarkBarView::Init() {
   // UpdateColors(), which will set the appropriate colors for all the objects
   // added in this function.
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   if (!kDefaultFavicon)
     kDefaultFavicon = rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
@@ -1193,9 +1193,9 @@ MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   MenuButton* button = new OverFlowButton(this);
-  button->SetIcon(*ResourceBundle::GetSharedInstance().
-                  GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
+  button->SetIcon(*rb.GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 03facfe..ae28757 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -177,8 +177,8 @@ void BookmarkBubbleView::Init() {
       l10n_util::GetStringUTF16(
           newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED :
                               IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK));
-  title_label->SetFont(
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  title_label->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   title_label->SetEnabledColor(SkColorSetRGB(6, 45, 117));
 
   GridLayout* layout = new GridLayout(this);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
index 12e218e..371c6e9 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -435,8 +435,8 @@ void BookmarkMenuDelegate::BuildMenuForPermanentNode(
   }
   int id = *next_menu_id;
   (*next_menu_id)++;
-  SkBitmap* folder_icon = ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  SkBitmap* folder_icon = rb.GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
   MenuItemView* submenu = menu->AppendSubMenuWithIcon(
       id, node->GetTitle(), *folder_icon);
   BuildMenu(node, 0, submenu, next_menu_id);
@@ -448,6 +448,7 @@ void BookmarkMenuDelegate::BuildMenu(const BookmarkNode* parent,
                                      MenuItemView* menu,
                                      int* next_menu_id) {
   DCHECK(parent->empty() || start_child_index < parent->child_count());
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   for (int i = start_child_index; i < parent->child_count(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
     int id = *next_menu_id;
@@ -456,14 +457,12 @@ void BookmarkMenuDelegate::BuildMenu(const BookmarkNode* parent,
     if (node->is_url()) {
       SkBitmap icon = profile_->GetBookmarkModel()->GetFavicon(node);
       if (icon.width() == 0) {
-        icon = *ResourceBundle::GetSharedInstance().
-            GetBitmapNamed(IDR_DEFAULT_FAVICON);
+        icon = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
       }
       menu->AppendMenuItemWithIcon(id, node->GetTitle(), icon);
       node_to_menu_id_map_[node] = id;
     } else if (node->is_folder()) {
-      SkBitmap* folder_icon = ResourceBundle::GetSharedInstance().
-          GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
+      SkBitmap* folder_icon = rb.GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
       MenuItemView* submenu = menu->AppendSubMenuWithIcon(
           id, node->GetTitle(), *folder_icon);
       node_to_menu_id_map_[node] = id;
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index a18c24d..267fb2b 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -157,7 +157,7 @@ void BrowserActionButton::UpdateState() {
   if (!icon.isNull()) {
     SkPaint paint;
     paint.setXfermode(SkXfermode::Create(SkXfermode::kSrcOver_Mode));
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     SkBitmap bg;
     rb.GetBitmapNamed(IDR_BROWSER_ACTION)->copyTo(&bg,
@@ -902,7 +902,7 @@ int BrowserActionsContainer::IconWidth(bool include_padding) {
   static int icon_width = 0;
   if (!initialized) {
     initialized = true;
-    icon_width = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    icon_width = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_BROWSER_ACTION)->width();
   }
   return icon_width + (include_padding ? kItemSpacing : 0);
@@ -914,7 +914,7 @@ int BrowserActionsContainer::IconHeight() {
   static int icon_height = 0;
   if (!initialized) {
     initialized = true;
-    icon_height = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    icon_height = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_BROWSER_ACTION)->height();
   }
   return icon_height;
diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
index ffd0c63..5bd583b 100644
--- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
+++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
@@ -73,7 +73,7 @@ void CheckboxNativeThemeBorder::GetInsets(gfx::Insets* insets) const {
 void SetImageViewToId(views::View* image_view, int id) {
   views::ImageView* image = static_cast<views::ImageView*>(image_view);
   if (image)
-    image->SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(id));
+    image->SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(id));
 }
 
 }  // namespace
@@ -244,9 +244,9 @@ void ChromeToMobileBubbleView::Init() {
   std::vector<DictionaryValue*> mobiles = service_->mobiles();
   DCHECK_GT(mobiles.size(), 0U);
 
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::Label* title_label = new views::Label();
-  title_label->SetFont(
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
+  title_label->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   title_label->SetEnabledColor(kTitleColor);
   layout->StartRow(0, single_column_set_id);
   layout->AddView(title_label);
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index e67d0ff..b2e5757 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -82,7 +82,7 @@ class InfobarView : public views::View {
         kInfobarBorderSize, border_color);
     content_->set_border(border);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     info_image_ = new views::ImageView();
     info_image_->SetImage(rb.GetBitmapNamed(IDR_INFO));
     label_ = new views::Label();
diff --git a/chrome/browser/ui/views/confirm_bubble_view.cc b/chrome/browser/ui/views/confirm_bubble_view.cc
index 098b760..5c4e87b 100644
--- a/chrome/browser/ui/views/confirm_bubble_view.cc
+++ b/chrome/browser/ui/views/confirm_bubble_view.cc
@@ -87,7 +87,7 @@ void ConfirmBubbleView::Init() {
   const string16 title_text = model_->GetTitle();
   DCHECK(!title_text.empty());
   views::Label* title_label = new views::Label(title_text);
-  title_label->SetFont(bundle.GetFont(ResourceBundle::MediumFont));
+  title_label->SetFont(bundle.GetFont(ui::ResourceBundle::MediumFont));
   layout->AddView(title_label);
 
   views::ImageButton* close_button = new views::ImageButton(this);
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index 69c88b22..5785e36 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -107,7 +107,7 @@ class XPWindowResources : public views::WindowResources {
   static void InitClass() {
     static bool initialized = false;
     if (!initialized) {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i) {
         int id = kXPFramePartIDs[i];
         if (id != 0)
@@ -137,7 +137,7 @@ class VistaWindowResources : public views::WindowResources {
   static void InitClass() {
     static bool initialized = false;
     if (!initialized) {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i) {
         int id = kVistaFramePartIDs[i];
         if (id != 0)
@@ -293,7 +293,7 @@ ConstrainedWindowFrameView::ConstrainedWindowFrameView(
   // different set of bitmaps.
   container->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_SA));
   close_button_->SetImage(views::CustomButton::BS_HOT,
@@ -529,8 +529,8 @@ void ConstrainedWindowFrameView::InitClass() {
 #if defined(OS_WIN) && !defined(USE_AURA)
     title_font_ = new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont());
 #else
-    ResourceBundle& resources = ResourceBundle::GetSharedInstance();
-    title_font_ = &resources.GetFont(ResourceBundle::MediumFont);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    title_font_ = &rb.GetFont(ui::ResourceBundle::MediumFont);
 #endif
     initialized = true;
   }
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index 2ec3745..14e16504 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -97,8 +97,8 @@ void AppInfoView::Init(const string16& title_text,
   title_ = new views::Label(title_text);
   title_->SetMultiLine(true);
   title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  title_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD));
+  title_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD));
 
   if (!description_text.empty()) {
     PrepareDescriptionLabel(description_text);
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc
index 1208a03..5ae0cd2 100644
--- a/chrome/browser/ui/views/critical_notification_bubble_view.cc
+++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc
@@ -16,8 +16,8 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/text_button.h"
@@ -158,7 +158,7 @@ bool CriticalNotificationBubbleView::AcceleratorPressed(
 void CriticalNotificationBubbleView::Init() {
   bubble_created_ = base::Time::Now();
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   layout->SetInsets(0, kInset, kInset, kInset);
@@ -175,12 +175,11 @@ void CriticalNotificationBubbleView::Init() {
   layout->StartRow(0, top_column_set_id);
 
   views::ImageView* image = new views::ImageView();
-  image->SetImage(ResourceBundle::GetSharedInstance().
-       GetBitmapNamed(IDR_UPDATE_MENU3));
+  image->SetImage(rb.GetBitmapNamed(IDR_UPDATE_MENU3));
   layout->AddView(image);
 
   headline_ = new views::Label();
-  headline_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
+  headline_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   UpdateBubbleHeadline(GetRemainingTime());
   layout->AddView(headline_);
 
diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
index 93578b6..50199e1 100644
--- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
@@ -73,9 +73,9 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1,
                         views::GridLayout::USE_PREF, 0, 0);
 
-  gfx::Font bold_font =
-      ResourceBundle::GetSharedInstance().GetFont(
-          ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  gfx::Font bold_font = rb.GetFont(
+      ui::ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
   warning_ = new views::Label(warning_text, bold_font);
   warning_->SetMultiLine(true);
   warning_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index d722fa7..606ad698 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -13,8 +13,8 @@
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ -105,7 +105,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
   DCHECK(download_);
   download_->AddObserver(this);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   BodyImageSet normal_body_image_set = {
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_TOP),
@@ -187,7 +187,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
   // Initial tooltip value.
   tooltip_text_ = download_->GetFileNameToReportUser().LossyDisplayName();
 
-  font_ = ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+  font_ = rb.GetFont(ui::ResourceBundle::BaseFont);
   box_height_ = std::max<int>(2 * kVerticalPadding + font_.GetHeight() +
                                   kVerticalTextPadding + font_.GetHeight(),
                               2 * kVerticalPadding +
@@ -1037,7 +1037,7 @@ void DownloadItemView::ShowWarningDialog() {
   discard_button_->set_ignore_minimum_size(true);
   AddChildView(discard_button_);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // The dangerous download label text and icon are different under
   // different cases.
   if (mode_ == MALICIOUS_MODE) {
diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc
index 37fd4d4..8660740 100644
--- a/chrome/browser/ui/views/download/download_shelf_view.cc
+++ b/chrome/browser/ui/views/download/download_shelf_view.cc
@@ -305,7 +305,7 @@ void DownloadShelfView::ViewHierarchyChanged(bool is_add,
     set_background(views::Background::CreateSolidBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR)));
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     arrow_image_ = new views::ImageView();
     arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON));
     AddChildView(arrow_image_);
@@ -360,7 +360,7 @@ bool DownloadShelfView::CanFitFirstDownloadItem() {
 }
 
 void DownloadShelfView::UpdateButtonColors() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc
index 23a1efb..83d4b36f 100644
--- a/chrome/browser/ui/views/download/download_started_animation_views.cc
+++ b/chrome/browser/ui/views/download/download_started_animation_views.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -84,7 +84,7 @@ DownloadStartedAnimationWin::DownloadStartedAnimationWin(
       web_contents_(web_contents) {
   static SkBitmap* kDownloadImage = NULL;
   if (!kDownloadImage) {
-    kDownloadImage = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    kDownloadImage = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_DOWNLOAD_ANIMATION_BEGIN);
   }
 
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc
index e87a917..f0b580c 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -255,15 +255,12 @@ void EditSearchEngineDialog::UpdateImageViews() {
 void EditSearchEngineDialog::UpdateImageView(ImageView* image_view,
                                              bool is_valid,
                                              int invalid_message_id) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (is_valid) {
     image_view->SetTooltipText(string16());
-    image_view->SetImage(
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
-            IDR_INPUT_GOOD));
+    image_view->SetImage(rb.GetBitmapNamed(IDR_INPUT_GOOD));
   } else {
     image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id));
-    image_view->SetImage(
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
-            IDR_INPUT_ALERT));
+    image_view->SetImage(rb.GetBitmapNamed(IDR_INPUT_ALERT));
   }
 }
diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
index 7d9639b..bae8f2f 100644
--- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
@@ -130,7 +130,7 @@ class BundleInstalledBubble : public views::BubbleDelegateView,
   }
 
   void AddCloseButton(GridLayout* layout, views::ButtonListener* listener) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     views::ImageButton* button = new views::ImageButton(listener);
     button->SetImage(views::CustomButton::BS_NORMAL,
@@ -143,8 +143,8 @@ class BundleInstalledBubble : public views::BubbleDelegateView,
   }
 
   void AddHeading(GridLayout* layout, const string16& heading) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    gfx::Font bold_font = rb.GetFont(ResourceBundle::BaseFont).DeriveFont(
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    gfx::Font bold_font = rb.GetFont(ui::ResourceBundle::BaseFont).DeriveFont(
         kHeadingFontSizeDelta, gfx::Font::BOLD);
 
     views::Label* heading_label = new views::Label(heading, bold_font);
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index 02f6481..0622813 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -269,8 +269,8 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
     if (is_bundle_install()) {
       // We need to make the font bold like this, rather than using SetFont,
       // because otherwise SizeToFit mis-judges the width of the line.
-      gfx::Font bold_font = ResourceBundle::GetSharedInstance().GetFont(
-          ResourceBundle::BaseFont).DeriveFont(
+      gfx::Font bold_font = ui::ResourceBundle::GetSharedInstance().GetFont(
+          ui::ResourceBundle::BaseFont).DeriveFont(
               kHeadingFontSizeDelta, gfx::Font::BOLD);
       permissions_header = new views::Label(
           prompt.GetPermissionsHeading(), bold_font);
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index 19b0c6c..8287759 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -101,8 +101,8 @@ class InstalledBubbleContent : public views::View,
         type_(type),
         info_(NULL),
         manage_(NULL) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    const gfx::Font& font = rb.GetFont(ResourceBundle::BaseFont);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    const gfx::Font& font = rb.GetFont(ui::ResourceBundle::BaseFont);
 
     // Scale down to 43x43, but allow smaller icons (don't scale up).
     gfx::Size size(icon->width(), icon->height());
@@ -134,7 +134,7 @@ class InstalledBubbleContent : public views::View,
     base::i18n::AdjustStringForLocaleDirection(&extension_name);
     heading_ = new views::Label(l10n_util::GetStringFUTF16(
         IDS_EXTENSION_INSTALLED_HEADING, extension_name));
-    heading_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
+    heading_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
     heading_->SetMultiLine(true);
     heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(heading_);
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index 7721244..c82276b 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -76,18 +76,18 @@ FindBarView::FindBarView(FindBarHost* host)
       text_box_background_(NULL),
       text_box_background_left_(NULL) {
   set_id(VIEW_ID_FIND_IN_PAGE);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   find_text_ = new SearchTextfieldView();
   find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
-  find_text_->SetFont(rb.GetFont(ResourceBundle::BaseFont));
+  find_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
   find_text_->set_default_width_in_chars(kDefaultCharWidth);
   find_text_->SetController(this);
   find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
   AddChildView(find_text_);
 
   match_count_text_ = new views::Label();
-  match_count_text_->SetFont(rb.GetFont(ResourceBundle::BaseFont));
+  match_count_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
   match_count_text_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
   AddChildView(match_count_text_);
 
@@ -483,7 +483,7 @@ FindBarHost* FindBarView::find_bar_host() const {
 }
 
 void FindBarView::OnThemeChanged() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc
index ffb5a0b..76b7256 100644
--- a/chrome/browser/ui/views/first_run_bubble.cc
+++ b/chrome/browser/ui/views/first_run_bubble.cc
@@ -41,8 +41,8 @@ FirstRunBubble* FirstRunBubble::ShowBubble(Profile* profile,
 }
 
 void FirstRunBubble::Init() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  const gfx::Font& original_font = rb.GetFont(ResourceBundle::MediumFont);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  const gfx::Font& original_font = rb.GetFont(ui::ResourceBundle::MediumFont);
 
   views::Label* title = new views::Label(l10n_util::GetStringFUTF16(
       IDS_FR_BUBBLE_TITLE, GetDefaultSearchEngineName(profile_)));
diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
index 4a90c7e..75c42c1 100644
--- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
@@ -71,7 +71,7 @@ AppPanelBrowserFrameView::AppPanelBrowserFrameView(BrowserFrame* frame,
 
   frame->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
   close_button_->SetImage(views::CustomButton::BS_HOT,
@@ -309,7 +309,7 @@ gfx::Rect AppPanelBrowserFrameView::IconBounds() const {
 }
 
 void AppPanelBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   SkBitmap* top_left_corner = rb.GetBitmapNamed(IDR_WINDOW_TOP_LEFT_CORNER);
   SkBitmap* top_right_corner =
@@ -389,7 +389,7 @@ void AppPanelBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
 }
 
 void AppPanelBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   SkBitmap* frame_image = rb.GetBitmapNamed(IDR_FRAME_APP_PANEL);
   canvas->TileImageInt(*frame_image, 0, FrameBorderThickness(), width(),
@@ -416,7 +416,7 @@ void AppPanelBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
   int client_area_top = client_area_bounds.y();
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SkBitmap* top_left = rb.GetBitmapNamed(IDR_APP_TOP_LEFT);
   SkBitmap* top = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
   SkBitmap* top_right = rb.GetBitmapNamed(IDR_APP_TOP_RIGHT);
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index fe0aa57..7263f8f 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -128,15 +128,15 @@ FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView(
   set_border(bubble_border);
   set_focusable(false);
 
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   message_label_ = new views::Label();
-  message_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::MediumFont));
+  message_label_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
 
   mouse_lock_exit_instruction_ = new views::Label();
   mouse_lock_exit_instruction_->set_collapse_when_hidden(true);
   mouse_lock_exit_instruction_->SetText(bubble_->GetInstructionText());
   mouse_lock_exit_instruction_->SetFont(
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
+      rb.GetFont(ui::ResourceBundle::MediumFont));
 
   link_ = new views::Link();
   link_->set_collapse_when_hidden(true);
@@ -146,8 +146,7 @@ FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView(
   link_->SetText(l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE));
 #endif
   link_->set_listener(this);
-  link_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::MediumFont));
+  link_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   link_->SetPressedColor(message_label_->enabled_color());
   link_->SetEnabledColor(message_label_->enabled_color());
   link_->SetVisible(false);
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc
index cf2df86..0b2a6fa 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -67,7 +67,7 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(
       browser_(browser),
       error_(error) {
   DCHECK(error_);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int resource_id = error_->GetBubbleViewIconResourceID();
   scoped_ptr<views::ImageView> image_view(new views::ImageView());
   image_view->SetImage(rb.GetImageNamed(resource_id).ToSkBitmap());
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index 594c5af..a946b6b 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -555,7 +555,7 @@ gfx::Rect HungRendererDialogView::GetDisplayBounds(
 void HungRendererDialogView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     frozen_icon_ = rb.GetBitmapNamed(IDR_FROZEN_TAB_ICON);
     initialized = true;
   }
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index 199f66a..cb4eb21 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -110,7 +110,7 @@ void ExtensionInfoBar::OnImageLoaded(const gfx::Image& image,
 
   const SkBitmap* icon = NULL;
   // Fall back on the default extension icon on failure.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (image.IsEmpty())
     icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
   else
diff --git a/chrome/browser/ui/views/infobars/infobar_button_border.cc b/chrome/browser/ui/views/infobars/infobar_button_border.cc
index b2a4abe..52ee24c 100644
--- a/chrome/browser/ui/views/infobars/infobar_button_border.cc
+++ b/chrome/browser/ui/views/infobars/infobar_button_border.cc
@@ -13,7 +13,7 @@
 InfoBarButtonBorder::InfoBarButtonBorder() {
   set_vertical_padding(browser_defaults::kInfoBarBorderPaddingVertical);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   BorderImageSet normal_set = {
     rb.GetBitmapNamed(IDR_INFOBARBUTTON_TOP_LEFT_N),
     rb.GetBitmapNamed(IDR_INFOBARBUTTON_TOP_N),
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index f403bd8..5509e43 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -73,8 +73,9 @@ InfoBarView::~InfoBarView() {
 }
 
 views::Label* InfoBarView::CreateLabel(const string16& text) const {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::Label* label = new views::Label(text,
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
+      rb.GetFont(ui::ResourceBundle::MediumFont));
   label->SetBackgroundColor(background()->get_color());
   label->SetEnabledColor(SK_ColorBLACK);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ -83,10 +84,10 @@ views::Label* InfoBarView::CreateLabel(const string16& text) const {
 
 views::Link* InfoBarView::CreateLink(const string16& text,
                                      views::LinkListener* listener) const {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::Link* link = new views::Link;
   link->SetText(text);
-  link->SetFont(
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
+  link->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   link->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   link->set_listener(listener);
   link->SetBackgroundColor(background()->get_color());
@@ -102,13 +103,13 @@ views::MenuButton* InfoBarView::CreateMenuButton(
       NULL, text, menu_button_listener, true);
   menu_button->set_border(new InfoBarButtonBorder);
   menu_button->set_animate_on_state_change(false);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   menu_button->set_menu_marker(
       rb.GetBitmapNamed(IDR_INFOBARBUTTON_MENU_DROPARROW));
   menu_button->SetEnabledColor(SK_ColorBLACK);
   menu_button->SetHighlightColor(SK_ColorBLACK);
   menu_button->SetHoverColor(SK_ColorBLACK);
-  menu_button->SetFont(rb.GetFont(ResourceBundle::MediumFont));
+  menu_button->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   menu_button->set_focusable(true);
   return menu_button;
 }
@@ -124,8 +125,8 @@ views::TextButton* InfoBarView::CreateTextButton(
   text_button->SetEnabledColor(SK_ColorBLACK);
   text_button->SetHighlightColor(SK_ColorBLACK);
   text_button->SetHoverColor(SK_ColorBLACK);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  text_button->SetFont(rb.GetFont(ResourceBundle::MediumFont));
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  text_button->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
 #if defined(OS_WIN)
   if (needs_elevation &&
       (base::win::GetVersion() >= base::win::VERSION_VISTA) &&
@@ -223,7 +224,7 @@ void InfoBarView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
     }
 
     close_button_ = new views::ImageButton(this);
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
                             rb.GetBitmapNamed(IDR_CLOSE_BAR));
     close_button_->SetImage(views::CustomButton::BS_HOT,
diff --git a/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc b/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc
index 8a7dea7..5c6c0c7 100644
--- a/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc
+++ b/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc
@@ -22,7 +22,7 @@ ChromeToMobileView::ChromeToMobileView(
       command_updater_(command_updater) {
   set_id(VIEW_ID_CHROME_TO_MOBILE_BUTTON);
   set_accessibility_focusable(true);
-  SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_MOBILE));
+  SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_MOBILE));
   SetTooltipText(
       l10n_util::GetStringUTF16(IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP));
   SetVisible(command_updater_->IsCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE));
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index 589471f..96adf51 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -74,7 +74,7 @@ void ContentSettingImageView::UpdateFromWebContents(WebContents* web_contents) {
     SetVisible(false);
     return;
   }
-  SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       content_setting_image_model_->get_icon()));
   SetTooltipText(UTF8ToUTF16(content_setting_image_model_->get_tooltip()));
   SetVisible(true);
@@ -109,8 +109,8 @@ void ContentSettingImageView::UpdateFromWebContents(WebContents* web_contents) {
     // Initialize animated string. It will be cleared when animation is
     // completed.
     animated_text_ = l10n_util::GetStringUTF16(animated_string_id);
-    text_size_ = ResourceBundle::GetSharedInstance().GetFont(
-        ResourceBundle::MediumFont).GetStringWidth(animated_text_);
+    text_size_ = ui::ResourceBundle::GetSharedInstance().GetFont(
+        ui::ResourceBundle::MediumFont).GetStringWidth(animated_text_);
     text_size_ += 2 * kTextMarginPixels + kIconLeftMargin;
     if (border())
       border()->GetInsets(&saved_insets_);
@@ -214,9 +214,9 @@ void ContentSettingImageView::OnPaint(gfx::Canvas* canvas) {
     views::ImageView::OnPaint(canvas);
 
     // Paint text to the right of the icon.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     canvas->DrawStringInt(animated_text_,
-        rb.GetFont(ResourceBundle::MediumFont), SK_ColorBLACK,
+        rb.GetFont(ui::ResourceBundle::MediumFont), SK_ColorBLACK,
         GetImageBounds().right() + kTextMarginPixels, y(),
         width() - GetImageBounds().width(), height(),
         gfx::Canvas::TEXT_ALIGN_LEFT | gfx::Canvas::TEXT_VALIGN_MIDDLE);
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index 3d98af1..674db57 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -26,7 +26,7 @@ IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
       is_extension_icon_(false) {
   image_ = new views::ImageView();
   image_->SetImage(
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(contained_image));
+      ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(contained_image));
   AddChildView(image_);
 
   label_ = new views::Label();
@@ -78,8 +78,8 @@ gfx::Size IconLabelBubbleView::GetNonLabelSize() const {
 }
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
-  return kBubbleOuterPadding + ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_OMNIBOX_SEARCH)->width() +
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  return kBubbleOuterPadding + rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH)->width() +
       LocationBarView::kItemPadding;
 }
 
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
index 960f820..d514f94 100644
--- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
+++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -32,8 +32,8 @@ KeywordHintView::KeywordHintView(Profile* profile) : profile_(profile) {
   trailing_label_ = CreateLabel();
 
   if (!kTabButtonBitmap) {
-    kTabButtonBitmap = ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    kTabButtonBitmap = rb.GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
   }
 }
 
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index e0a24ee..5d2111d 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -167,7 +167,7 @@ LocationBarView::LocationBarView(Profile* profile,
   if (mode_ == NORMAL) {
     painter_.reset(
         views::Painter::CreateImagePainter(
-            *ResourceBundle::GetSharedInstance().GetImageNamed(
+            *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
                 IDR_LOCATION_BAR_BORDER).ToSkBitmap(),
             gfx::Insets(kBorderRoundCornerHeight, kBorderRoundCornerWidth,
                 kBorderRoundCornerHeight, kBorderRoundCornerWidth),
@@ -184,13 +184,12 @@ LocationBarView::~LocationBarView() {
 }
 
 void LocationBarView::Init() {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (mode_ == POPUP) {
-    font_ = ResourceBundle::GetSharedInstance().GetFont(
-        ResourceBundle::BaseFont);
+    font_ = rb.GetFont(ui::ResourceBundle::BaseFont);
   } else {
     // Use a larger version of the system font.
-    font_ = ResourceBundle::GetSharedInstance().GetFont(
-        ResourceBundle::MediumFont);
+    font_ = rb.GetFont(ui::ResourceBundle::MediumFont);
   }
 
   // If this makes the font too big, try to make it smaller so it will fit.
@@ -619,8 +618,9 @@ void LocationBarView::Layout() {
         selected_keyword_view_->SetImage(bitmap);
         selected_keyword_view_->set_is_extension_icon(true);
       } else {
-        selected_keyword_view_->SetImage(*ResourceBundle::GetSharedInstance().
-            GetBitmapNamed(IDR_OMNIBOX_SEARCH));
+        ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+        selected_keyword_view_->SetImage(
+            *rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH));
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
@@ -901,7 +901,7 @@ void LocationBarView::OnAutocompleteAccept(
 
 void LocationBarView::OnChanged() {
   location_icon_view_->SetImage(
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
           location_entry_->GetIcon()));
   location_icon_view_->ShowTooltip(!location_entry()->IsEditingOrEmpty());
 
diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc
index 75a3b15..98a2d2c 100644
--- a/chrome/browser/ui/views/location_bar/star_view.cc
+++ b/chrome/browser/ui/views/location_bar/star_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -29,7 +29,7 @@ StarView::~StarView() {
 void StarView::SetToggled(bool on) {
   SetTooltipText(l10n_util::GetStringUTF16(
       on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR));
-  SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       on ? IDR_STAR_LIT : IDR_STAR));
 }
 
diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc
index 3f57693..f0d0809 100644
--- a/chrome/browser/ui/views/notifications/balloon_view.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view.cc
@@ -308,7 +308,7 @@ gfx::Rect BalloonViewImpl::GetLabelBounds() const {
 }
 
 void BalloonViewImpl::Show(Balloon* balloon) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   balloon_ = balloon;
 
@@ -391,7 +391,7 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   options_menu_button_->set_border(NULL);
   options_menu_button_->SetBoundsRect(GetOptionsButtonBounds());
 
-  source_label_->SetFont(rb.GetFont(ResourceBundle::SmallFont));
+  source_label_->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
   source_label_->SetBackgroundColor(kControlBarBackgroundColor);
   source_label_->SetEnabledColor(kControlBarTextColor);
   source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index 6c347d0..10adbff 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/web_contents.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -49,8 +49,8 @@ SadTabView::SadTabView(WebContents* web_contents, Kind kind)
     : web_contents_(web_contents),
       kind_(kind),
       painted_(false),
-      base_font_(ResourceBundle::GetSharedInstance().GetFont(
-          ResourceBundle::BaseFont)),
+      base_font_(ui::ResourceBundle::GetSharedInstance().GetFont(
+          ui::ResourceBundle::BaseFont)),
       message_(NULL),
       help_link_(NULL),
       feedback_link_(NULL),
@@ -115,7 +115,7 @@ void SadTabView::ViewHierarchyChanged(bool is_add,
   columns->AddPaddingColumn(1, kPadding);
 
   views::ImageView* image = new views::ImageView();
-  image->SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  image->SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       (kind_ == CRASHED) ? IDR_SAD_TAB : IDR_KILLED_TAB));
   layout->StartRowWithPadding(0, column_set_id, 1, kPadding);
   layout->AddView(image);
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index bf3f0d6..badd2be 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -83,9 +83,8 @@ class StatusBubbleViews::StatusView : public views::Label,
         opacity_start_(0),
         opacity_end_(0),
         theme_service_(theme_provider) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    gfx::Font font(rb.GetFont(ResourceBundle::BaseFont));
-    SetFont(font);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
   }
 
   virtual ~StatusView() {
@@ -596,8 +595,8 @@ void StatusBubbleViews::Reposition() {
 }
 
 gfx::Size StatusBubbleViews::GetPreferredSize() {
-  return gfx::Size(0, ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont).GetHeight() + kTotalVerticalPadding);
+  return gfx::Size(0, ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont).GetHeight() + kTotalVerticalPadding);
 }
 
 void StatusBubbleViews::SetBounds(int x, int y, int w, int h) {
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
index b40ec9c..d883a02 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -29,7 +29,7 @@ TEST(StatusTrayWinTest, CreateIconAndMenu) {
   // down.
   StatusTrayWin tray;
   StatusIcon* icon = tray.CreateStatusIcon();
-  SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  SkBitmap* bitmap = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_STATUS_TRAY_ICON);
   icon->SetImage(*bitmap);
   icon->SetPressedImage(*bitmap);
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
index 6a72d7b..a8fd236 100644
--- a/chrome/browser/ui/views/tab_icon_view.cc
+++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -40,8 +40,8 @@ void TabIconView::InitializeIfNeeded() {
         IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16));
     DestroyIcon(app_icon);
 #else
-    g_default_favicon =
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_PRODUCT_LOGO_16);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    g_default_favicon = rb.GetBitmapNamed(IDR_PRODUCT_LOGO_16);
 #endif
   }
 }
@@ -63,7 +63,7 @@ void TabIconView::Update() {
   if (!initialized) {
     initialized = true;
     SkBitmap throbber(
-        *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_THROBBER));
+        *ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_THROBBER));
     throbber_frame_count = throbber.width() / throbber.height();
   }
 
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index e5bf7e3..1769bdc 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -390,7 +390,7 @@ void BaseTab::AdvanceLoadingAnimation(TabRendererData::NetworkState old_state,
   static int waiting_to_loading_frame_count_ratio = 0;
   if (!initialized) {
     initialized = true;
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     SkBitmap loading_animation(*rb.GetBitmapNamed(IDR_THROBBER));
     loading_animation_frame_count =
         loading_animation.width() / loading_animation.height();
@@ -441,7 +441,7 @@ void BaseTab::PaintIcon(gfx::Canvas* canvas) {
     canvas->Save();
     canvas->ClipRect(GetLocalBounds());
     if (should_display_crashed_favicon_) {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       SkBitmap crashed_favicon(*rb.GetBitmapNamed(IDR_SAD_FAVICON));
       bounds.set_y(bounds.y() + favicon_hiding_offset_);
       DrawIconCenter(canvas, crashed_favicon, 0,
@@ -571,8 +571,8 @@ void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
-    font_ = new gfx::Font(
-        ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    font_ = new gfx::Font(rb.GetFont(ui::ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }
diff --git a/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc b/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc
index d1569dd..d964ae5 100644
--- a/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc
@@ -92,7 +92,7 @@ class DockView : public views::View {
         outer_rect, SkIntToScalar(kRoundedRectRadius),
         SkIntToScalar(kRoundedRectRadius), paint);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     SkBitmap* high_icon = rb.GetBitmapNamed(IDR_DOCK_HIGH);
     SkBitmap* wide_icon = rb.GetBitmapNamed(IDR_DOCK_WIDE);
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 15ac45a..4010b1b5 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -260,7 +260,7 @@ void Tab::OnPaint(gfx::Canvas* canvas) {
   // If the close button color has changed, generate a new one.
   if (!close_button_color_ || title_color != close_button_color_) {
     close_button_color_ = title_color;
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button()->SetBackground(close_button_color_,
         rb.GetBitmapNamed(IDR_TAB_CLOSE),
         rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
@@ -635,7 +635,7 @@ void Tab::InitTabResources() {
 // static
 void Tab::LoadTabImages() {
   // We're not letting people override tab images just yet.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   tab_alpha_.image_l = rb.GetBitmapNamed(IDR_TAB_ALPHA_LEFT);
   tab_alpha_.image_r = rb.GetBitmapNamed(IDR_TAB_ALPHA_RIGHT);
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 4f78495..f14964d 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -35,8 +35,8 @@
 #include "ui/base/touch/touch_mode_support.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
-#include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/mouse_watcher_view_host.h"
 #include "ui/views/widget/default_theme_provider.h"
@@ -1675,7 +1675,7 @@ int TabStrip::GetDropEffect(const views::DropTargetEvent& event) {
 
 // static
 SkBitmap* TabStrip::GetDropArrowImage(bool is_down) {
-  return ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc
index 05acbcd..d7130f0 100644
--- a/chrome/browser/ui/views/theme_background.cc
+++ b/chrome/browser/ui/views/theme_background.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -25,7 +25,7 @@ void ThemeBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
 
   // Never theme app and popup windows.
   if (!browser_view_->IsBrowserTypeNormal()) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     if (browser_view_->IsActive())
       background = rb.GetBitmapNamed(IDR_FRAME);
     else
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 690b648..c0902e1 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -127,8 +127,8 @@ ToolbarView::ToolbarView(Browser* browser)
       DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
 
   if (!kPopupBackgroundEdge) {
-    kPopupBackgroundEdge = ResourceBundle::GetSharedInstance().GetBitmapNamed(
-        IDR_LOCATIONBG_POPUPMODE_EDGE);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    kPopupBackgroundEdge = rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_EDGE);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
@@ -513,7 +513,7 @@ gfx::Size ToolbarView::GetPreferredSize() {
 
     CR_DEFINE_STATIC_LOCAL(SkBitmap, normal_background, ());
     if (normal_background.isNull()) {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
     }
 
diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc
index 591ad46..f71d2f6 100644
--- a/chrome/browser/ui/views/web_intent_picker_views.cc
+++ b/chrome/browser/ui/views/web_intent_picker_views.cc
@@ -104,7 +104,7 @@ StarsView::StarsView(double rating)
     : rating_(rating) {
   const int kSpacing = 1;  // Spacing between stars in pixels.
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, kSpacing));
 
@@ -901,13 +901,13 @@ void WebIntentPickerViews::InitContents() {
   indent_cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                        GridLayout::USE_PREF, 0, 0);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Header row.
   grid_layout->StartRow(0, kHeaderRowColumnSet);
   action_label_ = new views::Label();
   action_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  action_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
+  action_label_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   grid_layout->AddView(action_label_);
 
 #if defined(USE_CLOSE_BUTTON)
@@ -962,7 +962,7 @@ void WebIntentPickerViews::SizeToContents() {
 
 #if defined(USE_CLOSE_BUTTON)
 views::ImageButton* WebIntentPickerViews::CreateCloseButton() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index 85813ab..753e80f 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -426,7 +426,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView,
     fullscreen_button_ = new FullscreenButton(this);
     fullscreen_button_->SetImage(
         ImageButton::BS_NORMAL,
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_FULLSCREEN_MENU_BUTTON));
     fullscreen_button_->set_focusable(true);
     fullscreen_button_->set_request_focus_on_press(false);