Move a bunch of random other files to src/ui/base...

chrome/browser/ui/views/tabs/base_tab.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/base_tab.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/font.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/throb_animation.h"
+#include "ui/base/theme_provider.h"
 #include "views/controls/button/image_button.h"
 
 // How long the pulse throb takes.
 static const int kPulseDurationMs = 200;
 
 // How long the hover state takes.
 static const int kHoverDurationMs = 400;
 
 namespace {
 
@@ skipping 261 matching lines @@
     *tooltip = UTF16ToWide(data_.title);
     return true;
   }
   return false;
 }
 
 AccessibilityTypes::Role BaseTab::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_PAGETAB;
 }
 
-ThemeProvider* BaseTab::GetThemeProvider() {
-  ThemeProvider* tp = View::GetThemeProvider();
+ui::ThemeProvider* BaseTab::GetThemeProvider() {
+  ui::ThemeProvider* tp = View::GetThemeProvider();
   return tp ? tp : theme_provider_;
 }
 
 void BaseTab::AdvanceLoadingAnimation(TabRendererData::NetworkState old_state,
                                       TabRendererData::NetworkState state) {
   static bool initialized = false;
   static int loading_animation_frame_count = 0;
   static int waiting_animation_frame_count = 0;
   static int waiting_to_loading_frame_count_ratio = 0;
   if (!initialized) {
@@ skipping 32 matching lines @@
   if (base::i18n::IsRTL()) {
     x = width() - x -
         (data().favicon.isNull() ? kFavIconSize : data().favicon.width());
   }
 
   int favicon_x = x;
   if (!data().favicon.isNull() && data().favicon.width() != kFavIconSize)
     favicon_x += (data().favicon.width() - kFavIconSize) / 2;
 
   if (data().network_state != TabRendererData::NETWORK_STATE_NONE) {
-    ThemeProvider* tp = GetThemeProvider();
+    ui::ThemeProvider* tp = GetThemeProvider();
     SkBitmap frames(*tp->GetBitmapNamed(
         (data().network_state == TabRendererData::NETWORK_STATE_WAITING) ?
         IDR_THROBBER_WAITING : IDR_THROBBER));
     int image_size = frames.height();
     int image_offset = loading_animation_frame_ * image_size;
     int dst_y = (height() - image_size) / 2;
     canvas->DrawBitmapInt(frames, image_offset, 0, image_size,
                           image_size, favicon_x, dst_y, image_size, image_size,
                           false);
   } else {
@@ skipping 95 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     font_ = new gfx::Font(
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }