Merge 143605 - grd file update for new 2x assets

chrome/browser/ui/views/location_bar/keyword_hint_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/keyword_hint_view.h"
 
 #include <vector>
 
 #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_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/label.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.
@@ skipping 103 matching lines @@
 
 views::Label* KeywordHintView::CreateLabel() {
   views::Label* label = new views::Label();
   label->SetBackgroundColor(LocationBarView::GetColor(ToolbarModel::NONE,
       LocationBarView::BACKGROUND));
   label->SetEnabledColor(LocationBarView::GetColor(ToolbarModel::NONE,
       LocationBarView::DEEMPHASIZED_TEXT));
   AddChildView(label);
   return label;
 }