Merge 143605 - grd file update for new 2x assets

chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 <cmath>
 
 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // How far to inset the hint text area from sides.
 const CGFloat kHintTextYInset = 4.0;
 
@@ skipping 26 matching lines @@
            text_color, NSForegroundColorAttributeName,
            nil];
   attributes_.reset([attributes retain]);
 }
 
 KeywordHintDecoration::~KeywordHintDecoration() {
 }
 
 NSImage* KeywordHintDecoration::GetHintImage() {
   if (!hint_image_) {
-    SkBitmap* skiaBitmap = ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
-    if (skiaBitmap)
-      hint_image_.reset([gfx::SkBitmapToNSImage(*skiaBitmap) retain]);
+    hint_image_.reset([ResourceBundle::GetSharedInstance().
+        GetNativeImageNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB) retain]);
   }
   return hint_image_;
 }
 
 void KeywordHintDecoration::SetKeyword(const string16& short_name,
                                        bool is_extension_keyword) {
   // KEYWORD_HINT is a message like "Press [tab] to search <site>".
   // [tab] is a parameter to be replaced by an image.  "<site>" is
   // derived from |short_name|.
   std::vector<size_t> content_param_offsets;
@@ skipping 77 matching lines @@
         [hint_suffix_ sizeWithAttributes:attributes_].width;
 
     // Right-justify the text within the remaining space, so it
     // doesn't get too close to the image relative to a following
     // decoration.
     suffix_rect.origin.x = NSMaxX(suffix_rect) - suffix_width;
     DCHECK_GE(NSWidth(suffix_rect), suffix_width);
     [hint_suffix_ drawInRect:suffix_rect withAttributes:attributes_];
   }
 }