Move ResourceBundle, DataPack to ui/base

chrome/browser/ui/views/location_bar/keyword_hint_view.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/location_bar/keyword_hint_view.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/label.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 
 // Amount of space to offset the tab image from the top of the view by.
 static const int kTabImageYOffset = 4;
 
 // The tab key image.
 static const SkBitmap* kTabButtonBitmap = NULL;
 
 KeywordHintView::KeywordHintView(Profile* profile) : profile_(profile) {
   leading_label_ = new views::Label();
   trailing_label_ = new views::Label();
@@ skipping 94 matching lines @@
 
   if (show_labels) {
     pref = leading_label_->GetPreferredSize();
     leading_label_->SetBounds(x, 0, pref.width(), height());
 
     x += pref.width() + kTabButtonBitmap->width();
     pref = trailing_label_->GetPreferredSize();
     trailing_label_->SetBounds(x, 0, pref.width(), height());
   }
 }