Merge 144337 - build fix

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

 // 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.
 
 #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 "grit/theme_resources_standard.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"
 
 namespace {
 
 // Amount of padding at the edges of the bubble.
 //
 // This can't be statically initialized because
@@ skipping 72 matching lines @@
 int IconLabelBubbleView::GetPreLabelWidth() const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return GetBubbleOuterPadding() +
       rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)->width() +
       LocationBarView::GetItemPadding();
 }
 
 int IconLabelBubbleView::GetNonLabelWidth() const {
   return GetPreLabelWidth() + GetBubbleOuterPadding();
 }