gtk: Add missing ui:: to ResourceBundle references.

NOTE: This is a TODO for beng@ in ui/base/resource/resource_bundle.h

R=erg@chromium.org

Review URL: http://codereview.chromium.org/8995014

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

30 files changed, 71 insertions, 70 deletions

diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc
index da50541..d1d7f88 100644
--- a/chrome/browser/ui/gtk/about_chrome_dialog.cc
+++ b/chrome/browser/ui/gtk/about_chrome_dialog.cc
@@ -85,7 +85,7 @@ gboolean OnEventBoxExpose(GtkWidget* event_box,
   gdk_cairo_rectangle(cr, &expose->area);
   cairo_clip(cr);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::CairoCachedSurface* background =
       rb.GetNativeImageNamed(IDR_ABOUT_BACKGROUND_COLOR).ToCairo();
   background->SetSource(cr, event_box, 0, 0);
@@ -100,7 +100,7 @@ gboolean OnEventBoxExpose(GtkWidget* event_box,
 }  // namespace
 
 void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   static GdkPixbuf* background = rb.GetNativeImageNamed(IDR_ABOUT_BACKGROUND);
 
   // Build the dialog.
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
index 65ccaac..b1710eb 100644
--- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
+++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
@@ -242,7 +242,7 @@ void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
     const SkBitmap* avatar_image = item_.icon.ToSkBitmap();
     gfx::CanvasSkia canvas(*avatar_image, /* is_opaque */ true);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     SkBitmap check_image = rb.GetImageNamed(IDR_PROFILE_SELECTED);
     gfx::Rect check_rect(0, 0, check_image.width(), check_image.height());
     int y = avatar_image->height() - check_image.height();
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index fa932b4..c0e1881 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -562,7 +562,7 @@ void BookmarkBarGtk::SetOverflowButtonAppearance() {
 
   GtkWidget* new_child = theme_service_->UsingNativeTheme() ?
       gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE) :
-      gtk_image_new_from_pixbuf(ResourceBundle::GetSharedInstance().
+      gtk_image_new_from_pixbuf(ui::ResourceBundle::GetSharedInstance().
           GetRTLEnabledPixbufNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   gtk_container_add(GTK_CONTAINER(overflow_button_), new_child);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
index 37b22e0b..2af9ff7 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
@@ -18,8 +18,8 @@
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_utils.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
@@ -143,8 +143,8 @@ gboolean OnDragIconExpose(GtkWidget* sender,
   gfx::CanvasSkiaPaint canvas(event, false);
   int text_x = gdk_pixbuf_get_width(data->favicon) + kBarButtonPadding;
   int text_width = allocation.width - text_x;
-  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);
   canvas.DrawStringInt(data->text, base_font, data->text_color,
                        text_x, 0, text_width, allocation.height);
 
@@ -197,8 +197,8 @@ GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
     g_object_ref(window);
     g_signal_connect(window, "destroy", G_CALLBACK(OnDragIconDestroy), data);
 
-    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);
     gtk_widget_set_size_request(window, kDragRepresentationWidth,
                                 base_font.GetHeight());
   } else {
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index 86f2f9a..1203082 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -111,7 +111,7 @@ gboolean OnMouseMoveEvent(GtkWidget* widget, GdkEventMotion* event,
 GdkPixbuf* GetOTRAvatar() {
   static GdkPixbuf* otr_avatar = NULL;
   if (!otr_avatar) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     otr_avatar = rb.GetRTLEnabledPixbufNamed(IDR_OTR_ICON);
   }
   return otr_avatar;
@@ -379,7 +379,7 @@ void BrowserTitlebar::Init() {
                        FALSE, 0);
     // We use the app logo as a placeholder image so the title doesn't jump
     // around.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     app_mode_favicon_ = gtk_image_new_from_pixbuf(
         rb.GetRTLEnabledPixbufNamed(IDR_PRODUCT_LOGO_16));
     g_object_set_data(G_OBJECT(app_mode_favicon_), "left-align-popup",
@@ -643,7 +643,7 @@ void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) {
         throbber_.GetNextFrame(tab_contents->IsWaitingForResponse());
     gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
   } else {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     // Note: we want to exclude the application popup window.
     if (browser_window_->browser()->is_app() &&
@@ -1092,7 +1092,7 @@ static std::vector<GdkPixbuf*>* g_throbber_waiting_frames = NULL;
 // square GdkPixbufs that get stored in |frames|.
 static void MakeThrobberFrames(int resource_id,
                                std::vector<GdkPixbuf*>* frames) {
-  ResourceBundle &rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle &rb = ui::ResourceBundle::GetSharedInstance();
   SkBitmap* frame_strip = rb.GetBitmapNamed(resource_id);
 
   // Each frame of the animation is a square, so we use the height as the
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
index 11c88f7..c710560 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
@@ -536,7 +536,7 @@ gboolean BrowserToolbarGtk::OnAlignmentExpose(GtkWidget* widget,
         allocation.y + allocation.height);
     cairo_t* copy_cr = cairo_create(target);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     cairo_set_operator(copy_cr, CAIRO_OPERATOR_SOURCE);
     if (draw_left_corner) {
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 5ad2b6b..5c2512a 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -449,7 +449,7 @@ gboolean BrowserWindowGtk::OnCustomFrameExpose(GtkWidget* widget,
 
 void BrowserWindowGtk::DrawContentShadow(cairo_t* cr) {
   // Draw the shadow above the toolbar. Tabs on the tabstrip will draw over us.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int left_x, top_y;
   gtk_widget_translate_coordinates(toolbar_->widget(),
       GTK_WIDGET(window_), 0, 0, &left_x,
@@ -582,7 +582,7 @@ void BrowserWindowGtk::DrawContentShadow(cairo_t* cr) {
 void BrowserWindowGtk::DrawPopupFrame(cairo_t* cr,
                                       GtkWidget* widget,
                                       GdkEventExpose* event) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Like DrawCustomFrame(), except that we use the unthemed resources to draw
   // the background. We do this because we can't rely on sane images in the
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index d70c2e8..447f6c8 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/ui/gtk/custom_button.h"
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/debug/trace_event.h"
+#include "base/logging.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ -46,7 +46,7 @@ CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider,
                    content::Source<ThemeService>(theme_provider));
   } else {
     // Load the button images from the resource bundle.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     surfaces_[GTK_STATE_NORMAL]->UsePixbuf(
         normal_id_ ? rb.GetRTLEnabledPixbufNamed(normal_id_) : NULL);
     surfaces_[GTK_STATE_ACTIVE]->UsePixbuf(
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index d8333e8..e7d1e5a 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -626,7 +626,7 @@ void DownloadItemGtk::UpdateDangerIcon() {
         GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR);
   } else {
     // Set the warning icon.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     int pixbuf_id =
         get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ?
         IDR_SAFEBROWSING_WARNING : IDR_WARNING;
diff --git a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
index 1f8ded0..2ed9a4e 100644
--- a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
@@ -133,7 +133,7 @@ DownloadShelfGtk::DownloadShelfGtk(Browser* browser, GtkWidget* parent)
                                 13.4);
 
   // Make the download arrow icon.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* download_pixbuf = rb.GetNativeImageNamed(IDR_DOWNLOADS_FAVICON);
   GtkWidget* download_image = gtk_image_new_from_pixbuf(download_pixbuf);
 
@@ -256,7 +256,7 @@ void DownloadShelfGtk::Observe(int type,
         GTK_CHROME_LINK_BUTTON(link_button_),
         use_default_color ? NULL : &bookmark_color);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(
         theme_service_->GetColor(ThemeService::COLOR_TAB_TEXT),
         rb.GetBitmapNamed(IDR_CLOSE_BAR),
diff --git a/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
index b0507d4..7f0dbe4 100644
--- a/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
@@ -85,7 +85,7 @@ DownloadStartedAnimationGtk::DownloadStartedAnimationGtk(
       tab_contents_(tab_contents) {
   static GdkPixbuf* kDownloadImage = NULL;
   if (!kDownloadImage) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     kDownloadImage = rb.GetNativeImageNamed(IDR_DOWNLOAD_ANIMATION_BEGIN);
   }
 
diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
index 74730ab..cba847f 100644
--- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
@@ -249,13 +249,13 @@ void EditSearchEngineDialog::UpdateImage(GtkWidget* image,
   if (is_valid) {
     gtk_widget_set_has_tooltip(image, FALSE);
     gtk_image_set_from_pixbuf(GTK_IMAGE(image),
-        ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+        ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
             IDR_INPUT_GOOD));
   } else {
     gtk_widget_set_tooltip_text(
         image, l10n_util::GetStringUTF8(invalid_message_id).c_str());
     gtk_image_set_from_pixbuf(GTK_IMAGE(image),
-        ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+        ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
             IDR_INPUT_ALERT));
   }
 }
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 5bb733b..44a12c0 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -34,8 +34,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/browser/notification_source.h"
 #include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
@@ -536,7 +536,7 @@ void FindBarGtk::Observe(int type,
 
     gtk_misc_set_alignment(GTK_MISC(match_count_label_), 0.5, 1.0);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(
         theme_service_->GetColor(ThemeService::COLOR_TAB_TEXT),
         rb.GetBitmapNamed(IDR_CLOSE_BAR),
@@ -901,7 +901,7 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
     GtkAllocation border_allocation = bar->border_bin_->allocation;
 
     // Blit the left part of the background image once on the left.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     gfx::CairoCachedSurface* background_left =
         rb.GetRTLEnabledImageNamed(IDR_FIND_BOX_BACKGROUND_LEFT).ToCairo();
     background_left->SetSource(cr, widget,
diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc
index 7705945..5ed2e1e 100644
--- a/chrome/browser/ui/gtk/first_run_dialog.cc
+++ b/chrome/browser/ui/gtk/first_run_dialog.cc
@@ -187,7 +187,7 @@ void FirstRunDialog::ShowSearchEngineWindow() {
   gtk_container_add(GTK_CONTAINER(search_engine_window_), content_area);
 
   GdkPixbuf* pixbuf =
-      ResourceBundle::GetSharedInstance().GetRTLEnabledPixbufNamed(
+      ui::ResourceBundle::GetSharedInstance().GetRTLEnabledPixbufNamed(
           IDR_SEARCH_ENGINE_DIALOG_TOP);
   GtkWidget* top_image = gtk_image_new_from_pixbuf(pixbuf);
   // Right align the image.
@@ -338,7 +338,7 @@ void FirstRunDialog::OnTemplateURLServiceChanged() {
     int logo_id = (*search_engine_iter)->logo_id();
     if (show_images && logo_id > 0) {
       GdkPixbuf* pixbuf =
-          ResourceBundle::GetSharedInstance().GetNativeImageNamed(logo_id);
+          ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(logo_id);
       if (ballot_engines.size() > kNormalBallotSize) {
         GdkPixbuf* old = pixbuf;
         pixbuf = gdk_pixbuf_scale_simple(pixbuf,
diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc
index 5577aec..43604d8 100644
--- a/chrome/browser/ui/gtk/global_error_bubble.cc
+++ b/chrome/browser/ui/gtk/global_error_bubble.cc
@@ -50,7 +50,7 @@ GlobalErrorBubble::GlobalErrorBubble(Profile* profile,
   GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
 
   int resource_id = error_->GetBubbleViewIconResourceID();
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* pixbuf = rb.GetNativeImageNamed(resource_id).ToGdkPixbuf();
   GtkWidget* image_view = gtk_image_new_from_pixbuf(pixbuf);
 
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc
index 4b15f99..9d904bc 100644
--- a/chrome/browser/ui/gtk/gtk_theme_service.cc
+++ b/chrome/browser/ui/gtk/gtk_theme_service.cc
@@ -205,7 +205,7 @@ void BuildIconFromIDRWithColor(int id,
                                GtkStateType state,
                                GtkIconSet* icon_set) {
   SkColor color = GdkToSkColor(&style->fg[state]);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SkBitmap original = *rb.GetBitmapNamed(id);
 
   SkBitmap fill_color;
@@ -584,7 +584,7 @@ gfx::Image* GtkThemeService::GetFolderIcon(bool native) {
       return default_folder_icon_;
   }
 
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+  return &ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_BOOKMARK_BAR_FOLDER);
 }
 
@@ -604,7 +604,7 @@ gfx::Image* GtkThemeService::GetDefaultFavicon(bool native) {
       return default_bookmark_icon_;
   }
 
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+  return &ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_DEFAULT_FAVICON);
 }
 
@@ -1038,7 +1038,7 @@ SkBitmap* GtkThemeService::GenerateTabImage(int base_id) const {
 SkBitmap* GtkThemeService::GenerateTintedIcon(
     int base_id,
     const color_utils::HSL& tint) const {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return new SkBitmap(SkBitmapOperations::CreateHSLShiftedBitmap(
       *rb.GetBitmapNamed(base_id), tint));
 }
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 9c23ab8..ecc08b0 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -132,7 +132,7 @@ void OnLabelRealize(GtkWidget* label, gpointer pixel_width) {
 
 // Ownership of |icon_list| is passed to the caller.
 GList* GetIconList() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GList* icon_list = NULL;
   icon_list = g_list_append(icon_list,
                             rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32));
diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
index bf9342f..306edcd 100644
--- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
@@ -135,7 +135,7 @@ void HungRendererDialogGtk::Init() {
   // Wrap the icon in a vbox so it stays top aligned.
   GtkWidget* icon_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(hbox), icon_vbox, FALSE, FALSE, 0);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* icon_pixbuf = rb.GetNativeImageNamed(IDR_FROZEN_TAB_ICON);
   GtkWidget* icon = gtk_image_new_from_pixbuf(icon_pixbuf);
   gtk_box_pack_start(GTK_BOX(icon_vbox), icon, FALSE, FALSE, 0);
diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
index ff8d45c..6620aea 100644
--- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
@@ -71,7 +71,7 @@ void ExtensionInfoBarGtk::OnImageLoaded(
   // TODO(erg): IDR_EXTENSIONS_SECTION should have an IDR_INFOBAR_EXTENSIONS
   // icon of the correct size with real subpixel shading and such.
   SkBitmap* icon = image;
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (!image || image->empty())
     icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
 
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index c5d94e0..2eb0342 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -235,7 +235,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
   gtk_box_pack_start(GTK_BOX(tab_to_search_label_hbox),
                      tab_to_search_partial_label_, FALSE, FALSE, 0);
   GtkWidget* tab_to_search_hbox = gtk_hbox_new(FALSE, 0);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   tab_to_search_magnifier_ = gtk_image_new_from_pixbuf(
       rb.GetNativeImageNamed(IDR_KEYWORD_SEARCH_MAGNIFIER));
   gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_magnifier_,
@@ -974,7 +974,7 @@ void LocationBarViewGtk::SetKeywordLabel(const string16& keyword) {
       gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_), pixbuf);
       g_object_unref(pixbuf);
     } else {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_),
                                 rb.GetNativeImageNamed(IDR_OMNIBOX_SEARCH));
     }
diff --git a/chrome/browser/ui/gtk/nine_box.cc b/chrome/browser/ui/gtk/nine_box.cc
index 3c3332d..66f623f 100644
--- a/chrome/browser/ui/gtk/nine_box.cc
+++ b/chrome/browser/ui/gtk/nine_box.cc
@@ -9,8 +9,8 @@
 #include "base/logging.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
-#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/point.h"
 
 namespace {
@@ -77,7 +77,7 @@ NineBox::NineBox(int top_left, int top, int top_right, int left, int center,
 NineBox::NineBox(int image, int top_margin, int bottom_margin, int left_margin,
                  int right_margin)
     : unref_images_on_destroy_(true) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* pixbuf = rb.GetNativeImageNamed(image);
   int width = gdk_pixbuf_get_width(pixbuf);
   int height = gdk_pixbuf_get_height(pixbuf);
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
index 475e0cf..7f21874 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
@@ -277,7 +277,7 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   gtk_container_add(GTK_CONTAINER(label_alignment), source_label_);
   gtk_box_pack_start(GTK_BOX(hbox_), label_alignment, FALSE, FALSE, 0);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Create a button to dismiss the balloon and add it to the toolbar.
   close_button_.reset(new CustomDrawButton(IDR_TAB_CLOSE,
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index 853eebf..7beff7e 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -1833,8 +1833,8 @@ gfx::Font OmniboxViewGtk::GetFont() {
     return font;
   } else {
     return gfx::Font(
-        ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont).
-            GetFontName(),
+        ui::ResourceBundle::GetSharedInstance().GetFont(
+            ui::ResourceBundle::BaseFont).GetFontName(),
         popup_window_mode_ ?
             browser_defaults::kAutocompleteEditFontPixelSizeInPopup :
             browser_defaults::kAutocompleteEditFontPixelSize);
diff --git a/chrome/browser/ui/gtk/overflow_button.cc b/chrome/browser/ui/gtk/overflow_button.cc
index ae2137a..a1057b2 100644
--- a/chrome/browser/ui/gtk/overflow_button.cc
+++ b/chrome/browser/ui/gtk/overflow_button.cc
@@ -37,7 +37,7 @@ void OverflowButton::Observe(int type,
   GtkWidget* new_child =
       GtkThemeService::GetFrom(profile_)->UsingNativeTheme() ?
       gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE) :
-      gtk_image_new_from_pixbuf(ResourceBundle::GetSharedInstance().
+      gtk_image_new_from_pixbuf(ui::ResourceBundle::GetSharedInstance().
           GetRTLEnabledPixbufNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   gtk_container_add(GTK_CONTAINER(widget()), new_child);
diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc
index 873207d..5d4f11d 100644
--- a/chrome/browser/ui/gtk/sad_tab_gtk.cc
+++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc
@@ -72,7 +72,7 @@ SadTabGtk::SadTabGtk(TabContents* tab_contents, Kind kind)
 
   // Add center-aligned image.
   GtkWidget* image = gtk_image_new_from_pixbuf(
-      ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           kind == CRASHED ? IDR_SAD_TAB : IDR_KILLED_TAB));
   gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.5);
   gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
index a369b73..322ca87 100644
--- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
@@ -28,7 +28,7 @@ TEST(StatusTrayGtkTest, CreateIcon) {
   // Create an icon, set the images and tooltip, then shut it down.
   StatusTrayGtk 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/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 403ab70..b34a600 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -27,6 +27,7 @@
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
+#include "skia/ext/image_operations.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -34,12 +35,11 @@
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/gtk_util.h"
-#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/pango_util.h"
 #include "ui/gfx/platform_font_pango.h"
 #include "ui/gfx/skbitmap_operations.h"
-#include "skia/ext/image_operations.h"
 
 #if !GTK_CHECK_VERSION(2, 22, 0)
 #define gtk_button_get_event_window(button) button->event_window
@@ -397,7 +397,7 @@ void TabRendererGtk::UpdateData(TabContents* contents,
     // will eventually be chromium-themable and this code will go away.
     data_.is_default_favicon =
         (data_.favicon.pixelRef() ==
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_DEFAULT_FAVICON)->pixelRef());
   }
 
@@ -760,7 +760,7 @@ void TabRendererGtk::Layout() {
         theme_service_->GetColor(ThemeService::COLOR_TAB_TEXT);
       if (!close_button_color_ || tab_text_color != close_button_color_) {
         close_button_color_ = tab_text_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));
@@ -910,7 +910,7 @@ void TabRendererGtk::DrawTabBackground(
   tab_bg->ToCairo()->SetSource(cr, widget, -offset_x, -offset_y);
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Draw left edge
   gfx::Image& tab_l_mask = rb.GetNativeImageNamed(IDR_TAB_ALPHA_LEFT);
@@ -929,13 +929,12 @@ void TabRendererGtk::DrawTabBackground(
                                     width() - tab_active_l_width_, 0);
 }
 
-void TabRendererGtk::DrawTabShadow(
-    cairo_t* cr,
-    GtkWidget* widget,
-    int left_idr,
-    int center_idr,
-    int right_idr) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+void TabRendererGtk::DrawTabShadow(cairo_t* cr,
+                                   GtkWidget* widget,
+                                   int left_idr,
+                                   int center_idr,
+                                   int right_idr) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::Image& active_image_l = rb.GetNativeImageNamed(left_idr);
   gfx::Image& active_image_c = rb.GetNativeImageNamed(center_idr);
   gfx::Image& active_image_r = rb.GetNativeImageNamed(right_idr);
@@ -1114,7 +1113,7 @@ void TabRendererGtk::InitResources() {
     return;
 
   // Grab the pixel sizes of our masking images.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* tab_active_l = rb.GetNativeImageNamed(IDR_TAB_ACTIVE_LEFT);
   tab_active_l_width_ = gdk_pixbuf_get_width(tab_active_l);
   tab_active_l_height_ = gdk_pixbuf_get_height(tab_active_l);
@@ -1125,7 +1124,7 @@ void TabRendererGtk::InitResources() {
   close_button_width_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->width();
   close_button_height_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->height();
 
-  const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
+  const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index 1d00366..5b15a55 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
 
 #include <gtk/gtk.h>
+
 #include <algorithm>
 
 #include "base/bind.h"
@@ -1792,7 +1793,7 @@ bool TabStripGtk::CompleteDrop(guchar* data, bool is_plain_text) {
 
 // static
 gfx::Image* TabStripGtk::GetDropArrowImage(bool is_down) {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+  return &ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 6f6cda5..55f5456 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -759,7 +759,7 @@ std::string TaskManagerGtk::GetModelText(int row, int col_id) {
 GdkPixbuf* TaskManagerGtk::GetModelIcon(int row) {
   SkBitmap icon = model_->GetResourceIcon(row);
   if (icon.pixelRef() ==
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
           IDR_DEFAULT_FAVICON)->pixelRef()) {
     return static_cast<GdkPixbuf*>(g_object_ref(
         GtkThemeService::GetDefaultFavicon(true)->ToGdkPixbuf()));
diff --git a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc
index 0cee824..c72d04e 100644
--- a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc
+++ b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc
@@ -5,12 +5,13 @@
 #include "chrome/browser/ui/gtk/web_intent_picker_gtk.h"
 
 #include <algorithm>
+
 #include "base/bind.h"
 #include "base/callback.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
@@ -22,14 +23,14 @@
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/browsing_instance.h"
-#include "content/browser/site_instance.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
+#include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -138,7 +139,7 @@ void WebIntentPickerGtk::SetServiceURLs(const std::vector<GURL>& urls) {
       l10n_util::GetStringUTF8(IDS_FIND_MORE_INTENT_HANDLER_TOOLTIP).c_str());
   gtk_box_pack_start(GTK_BOX(button_hbox_), plus_button, FALSE, FALSE, 0);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* icon_pixbuf = rb.GetNativeImageNamed(IDR_SIDETABS_NEW_TAB);
   SetServiceButtonImage(plus_button, icon_pixbuf);
 
@@ -159,7 +160,7 @@ void WebIntentPickerGtk::SetServiceIcon(size_t index, const SkBitmap& icon) {
 void WebIntentPickerGtk::SetDefaultServiceIcon(size_t index) {
   GtkWidget* button = GetServiceButton(index);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* icon_pixbuf = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
   SetServiceButtonImage(button, icon_pixbuf);
 }
@@ -196,7 +197,7 @@ void WebIntentPickerGtk::InitContents() {
   gtk_container_set_border_width(GTK_CONTAINER(contents_),
                                  ui::kContentAreaBorder);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* image_pixbuf = rb.GetNativeImageNamed(IDR_PAGEINFO_INFO);
   GtkWidget* image = gtk_image_new_from_pixbuf(image_pixbuf);
   gtk_box_pack_start(GTK_BOX(contents_), image, FALSE, FALSE, 0);