summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 23:19:46 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 23:19:46 +0000
commit42ce29d4f464b36ddaebefb6d6c33e7418e93141 (patch)
tree0d0a4965d61ef1514dee70c9f2507529d8c5b178 /chrome/browser/speech
parent0ffeb598304f119e2d3df70d47a592d2dbc722da (diff)
downloadchromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.zip
chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.gz
chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.bz2
Move ResourceBundle, DataPack to ui/base
BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6263008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/speech_input_bubble.cc2
-rw-r--r--chrome/browser/speech/speech_input_bubble_gtk.cc2
-rw-r--r--chrome/browser/speech/speech_input_bubble_views.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/speech/speech_input_bubble.cc b/chrome/browser/speech/speech_input_bubble.cc
index 77619e9..eb5b82e 100644
--- a/chrome/browser/speech/speech_input_bubble.cc
+++ b/chrome/browser/speech/speech_input_bubble.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "app/resource_bundle.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/speech/speech_input_bubble.h"
#include "gfx/canvas_skia.h"
#include "gfx/rect.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
SpeechInputBubble::FactoryMethod SpeechInputBubble::factory_ = NULL;
const int SpeechInputBubble::kBubbleTargetOffsetX = 5;
diff --git a/chrome/browser/speech/speech_input_bubble_gtk.cc b/chrome/browser/speech/speech_input_bubble_gtk.cc
index b8bed6d..43b6c07 100644
--- a/chrome/browser/speech/speech_input_bubble_gtk.cc
+++ b/chrome/browser/speech/speech_input_bubble_gtk.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/speech/speech_input_bubble.h"
#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
@@ -16,6 +15,7 @@
#include "gfx/rect.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
namespace {
diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc
index c727b09..404dfb6 100644
--- a/chrome/browser/speech/speech_input_bubble_views.cc
+++ b/chrome/browser/speech/speech_input_bubble_views.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/speech/speech_input_bubble.h"
#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_window.h"
@@ -15,6 +14,7 @@
#include "gfx/canvas.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
#include "views/controls/button/native_button.h"
#include "views/controls/image_view.h"
#include "views/controls/label.h"