Merge 143605 - grd file update for new 2x assets

chrome/browser/speech/speech_recognition_bubble.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 "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "chrome/browser/speech/speech_recognition_bubble.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.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/gfx/rect.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 using content::WebContents;
 
 namespace {
 
 const color_utils::HSL kGrayscaleShift = { -1, 0, 0.6 };
@@ skipping 220 matching lines @@
 }
 
 void SpeechRecognitionBubbleBase::SetImage(const gfx::ImageSkia& image) {
   icon_image_.reset(new gfx::ImageSkia(image));
   UpdateImage();
 }
 
 gfx::ImageSkia SpeechRecognitionBubbleBase::icon_image() {
   return (icon_image_ != NULL) ? *icon_image_ : gfx::ImageSkia();
 }