Merge 143605 - grd file update for new 2x assets

chrome/browser/ui/cocoa/speech_recognition_window_controller.mm

 // 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.
 
 #import "speech_recognition_window_controller.h"
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 const int kBubbleControlVerticalSpacing = 10;  // Space between controls.
 const int kBubbleHorizontalMargin = 5;  // Space on either sides of controls.
 const int kInstructionLabelMaxWidth = 150;
 
@@ skipping 201 matching lines @@
 
 - (void)hide {
   [[self window] orderOut:nil];
 }
 
 - (void)setImage:(NSImage*)image {
   [iconImage_ setImage:image];
 }
 
 @end  // implementation SpeechRecognitionWindowController