views: Move the remaining files to ui/views/controls/.

chrome/browser/ui/views/location_bar/icon_label_bubble_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/icon_label_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
-#include "views/controls/image_view.h"
 
 // Amount of padding at the edges of the bubble.
 static const int kBubbleOuterPadding = LocationBarView::kEdgeItemPadding -
     LocationBarView::kBubbleHorizontalPadding;
 
 // Amount of padding after the label.
 static const int kLabelPadding = 5;
 
 IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
                                          int contained_image,
@@ skipping 55 matching lines @@
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
   return kBubbleOuterPadding + ResourceBundle::GetSharedInstance().
       GetBitmapNamed(IDR_OMNIBOX_SEARCH)->width() +
       LocationBarView::kItemPadding;
 }
 
 int IconLabelBubbleView::GetNonLabelWidth() const {
   return GetPreLabelWidth() + kBubbleOuterPadding;
 }