Merge 143605 - grd file update for new 2x assets

chrome/browser/speech/speech_recognition_tray_icon_controller.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/speech/speech_recognition_tray_icon_controller.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.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/rect.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 159 matching lines @@
     const string16& text) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   string16 title = l10n_util::GetStringUTF16(
       IDS_SPEECH_INPUT_TRAY_BALLOON_TITLE);
   string16 message = l10n_util::GetStringFUTF16(
           IDS_SPEECH_INPUT_TRAY_BALLOON_BODY,
           text);
 
   tray_icon_->DisplayBalloon(*g_images.Get().balloon_icon(), title, message);
 }